diff --git a/frontend/src/App.css b/frontend/src/App.css
index 018fa8f..e67f07f 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -882,6 +882,8 @@ h1, h2, h3, h4, h5, h6 {
   flex: 1;
   overflow-y: auto;
   padding: 16px;
+  overscroll-behavior: contain;
+  -webkit-overflow-scrolling: touch;
 }
 
 /* Chat empty state */
@@ -2355,8 +2357,14 @@ h1, h2, h3, h4, h5, h6 {
   }
 
   .chat-page {
+    position: fixed;
+    top: 53px;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: auto;
     padding-bottom: 0;
-    height: calc(100dvh - 53px);
+    z-index: 1;
   }
 
   .chat-page .chat-input {