diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 7aa8ab2f..b0d98b08 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -5,6 +5,7 @@ import {
   createSignal,
   For,
   Match,
+  on,
   Show,
   Switch,
   useContext,
@@ -162,6 +163,9 @@ export function Session() {
     return session()?.revert?.messageID
   })
 
+  // snap to bottom when session changes
+  createEffect(on(() => route.sessionID, toBottom))
+
   const local = useLocal()
 
   function moveChild(direction: number) {