diff --git a/packages/ui/src/components/message-nav.css b/packages/ui/src/components/message-nav.css
index 57316fbde85..465bd66fe5b 100644
--- a/packages/ui/src/components/message-nav.css
+++ b/packages/ui/src/components/message-nav.css
@@ -102,6 +102,8 @@
   align-items: center;
   border-radius: var(--radius-md);
   background: var(--surface-raised-stronger-non-alpha);
+  max-height: calc(100vh - 6rem);
+  overflow-y: auto;
 
   /* border/shadow-xs/base */
   box-shadow:
diff --git a/packages/ui/src/components/session-message-rail.css b/packages/ui/src/components/session-message-rail.css
index 5729e492044..9f248bed252 100644
--- a/packages/ui/src/components/session-message-rail.css
+++ b/packages/ui/src/components/session-message-rail.css
@@ -7,6 +7,9 @@
   position: absolute;
   left: 1.5rem;
   margin-top: 0.625rem;
+  top: 0;
+  bottom: 8rem;
+  overflow-y: auto;
 }
 
 [data-slot="session-message-rail-compact"] {