diff --git a/static/src/styles/components/chat/_chat-area.scss b/static/src/styles/components/chat/_chat-area.scss
index ee07b22..070f87c 100644
--- a/static/src/styles/components/chat/_chat-area.scss
+++ b/static/src/styles/components/chat/_chat-area.scss
@@ -5,8 +5,8 @@
     flex-direction: column;
     background: rgba(255, 255, 255, 0.78);
     min-width: 0;
-    min-height: calc(var(--app-viewport, 100vh) - 40px);
-    padding-bottom: 180px;
+    height: var(--app-viewport, 100vh);
+    overflow: hidden;
     position: relative;
     backdrop-filter: blur(6px);
 }
@@ -16,7 +16,8 @@
     flex: 1;
     overflow-y: auto;
     padding: 24px;
-    padding-bottom: calc(120px + var(--app-bottom-inset, 0px));
+    padding-top: 30px;
+    padding-bottom: calc(100px + var(--app-bottom-inset, 0px));
     min-height: 0;
     position: relative;
 }
@@ -50,7 +51,7 @@
 .scroll-lock-toggle {
     position: absolute;
     right: 28px;
-    bottom: 200px;
+    bottom: 140px;
     z-index: 25;
     display: flex;
     align-items: center;
diff --git a/static/src/styles/layout/_app-shell.scss b/static/src/styles/layout/_app-shell.scss
index bf88060..cd35061 100644
--- a/static/src/styles/layout/_app-shell.scss
+++ b/static/src/styles/layout/_app-shell.scss
@@ -3,10 +3,10 @@
     position: relative;
     display: flex;
     flex-direction: row;
-    min-height: var(--app-viewport, 100vh);
+    height: var(--app-viewport, 100vh);
+    align-items: stretch;
     background: var(--claude-bg);
     color: var(--claude-text);
-    overflow: hidden;
 }
 
 #app {