From d5ffc672dd32abd02898b4465a27506ea2af41f0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 20 Jan 2026 06:28:11 +0000
Subject: [PATCH] fix: scope chat scroll lock to chat shell (#1283) (thanks
 @bradleypriest)

---
 CHANGELOG.md             |  1 +
 ui/src/styles/layout.css | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56c821e60..8a6b90e84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Docs: https://docs.clawd.bot
 
 ### Fixes
 - Gateway: strip inbound envelope headers from chat history messages to keep clients clean.
+- UI: prevent double-scroll in Control UI chat by locking chat layout to the viewport. (#1283) — thanks @bradleypriest.
 
 ## 2026.1.19-2
 
diff --git a/ui/src/styles/layout.css b/ui/src/styles/layout.css
index d89a3be81..561ad4167 100644
--- a/ui/src/styles/layout.css
+++ b/ui/src/styles/layout.css
@@ -6,8 +6,6 @@
   --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;
@@ -19,6 +17,18 @@
   transition: grid-template-columns var(--shell-focus-duration) var(--shell-focus-ease);
 }
 
+.shell--chat {
+  min-height: 100vh;
+  height: 100vh;
+  overflow: hidden;
+}
+
+@supports (height: 100dvh) {
+  .shell--chat {
+    height: 100dvh;
+  }
+}
+
 .shell--nav-collapsed {
   grid-template-columns: 0px minmax(0, 1fr);
 }