diff --git a/ui/src/styles/layout.css b/ui/src/styles/layout.css
index 2ad636157..d89a3be81 100644
--- a/ui/src/styles/layout.css
+++ b/ui/src/styles/layout.css
@@ -6,6 +6,8 @@
   --shell-focus-duration: 220ms;
   --shell-focus-ease: cubic-bezier(0.2, 0.85, 0.25, 1);
   min-height: 100vh;
+  height: 100vh;
+  overflow: hidden;
   display: grid;
   grid-template-columns: var(--shell-nav-width) minmax(0, 1fr);
   grid-template-rows: var(--shell-topbar-height) 1fr;
@@ -309,6 +311,11 @@
   overflow-x: hidden;
 }
 
+/* Chat handles its own scrolling (chat-thread); avoid double scrollbars. */
+.content--chat {
+  overflow: hidden;
+}
+
 .shell--chat .content {
   /* No-op: keep chat layout consistent with other tabs */
 }