diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx
index b85cd5c6542..d3a78902fc9 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx
@@ -1,6 +1,8 @@
 import { TextAttributes } from "@opentui/core"
 import { useTheme } from "../context/theme"
 import { useSync } from "@tui/context/sync"
+import { useTerminalDimensions } from "@opentui/solid"
+import { ScrollBoxRenderable } from "@opentui/core"
 import { For, Match, Switch, Show, createMemo } from "solid-js"
 
 export type DialogStatusProps = {}
@@ -9,6 +11,10 @@ export function DialogStatus() {
   const sync = useSync()
   const { theme } = useTheme()
 
+  const dimensions = useTerminalDimensions()
+  const height = createMemo(() => Math.max(10, Math.floor(dimensions().height / 2.5)))
+  let scroll: ScrollBoxRenderable | undefined
+
   const enabledFormatters = createMemo(() => sync.data.formatter.filter((f) => f.enabled))
 
   const plugins = createMemo(() => {
@@ -37,126 +43,136 @@ export function DialogStatus() {
   })
 
   return (
-    <box paddingLeft={2} paddingRight={2} gap={1} paddingBottom={1}>
-      <box flexDirection="row" justifyContent="space-between">
+    <box gap={1} paddingBottom={1}>
+      <box flexDirection="row" justifyContent="space-between" paddingLeft={2} paddingRight={2}>
         <text fg={theme.text} attributes={TextAttributes.BOLD}>
           Status
         </text>
         <text fg={theme.textMuted}>esc</text>
       </box>
-      <Show when={Object.keys(sync.data.mcp).length > 0} fallback={<text fg={theme.text}>No MCP Servers</text>}>
-        <box>
-          <text fg={theme.text}>{Object.keys(sync.data.mcp).length} MCP Servers</text>
-          <For each={Object.entries(sync.data.mcp)}>
-            {([key, item]) => (
-              <box flexDirection="row" gap={1}>
-                <text
-                  flexShrink={0}
-                  style={{
-                    fg: (
-                      {
-                        connected: theme.success,
-                        failed: theme.error,
-                        disabled: theme.textMuted,
-                        needs_auth: theme.warning,
-                        needs_client_registration: theme.error,
-                      } as Record<string, typeof theme.success>
-                    )[item.status],
-                  }}
-                >
-                  •
-                </text>
-                <text fg={theme.text} wrapMode="word">
-                  <b>{key}</b>{" "}
-                  <span style={{ fg: theme.textMuted }}>
-                    <Switch fallback={item.status}>
-                      <Match when={item.status === "connected"}>Connected</Match>
-                      <Match when={item.status === "failed" && item}>{(val) => val().error}</Match>
-                      <Match when={item.status === "disabled"}>Disabled in configuration</Match>
-                      <Match when={(item.status as string) === "needs_auth"}>
-                        Needs authentication (run: opencode mcp auth {key})
-                      </Match>
-                      <Match when={(item.status as string) === "needs_client_registration" && item}>
-                        {(val) => (val() as { error: string }).error}
-                      </Match>
-                    </Switch>
-                  </span>
-                </text>
-              </box>
-            )}
-          </For>
-        </box>
-      </Show>
-      {sync.data.lsp.length > 0 && (
-        <box>
-          <text fg={theme.text}>{sync.data.lsp.length} LSP Servers</text>
-          <For each={sync.data.lsp}>
-            {(item) => (
-              <box flexDirection="row" gap={1}>
-                <text
-                  flexShrink={0}
-                  style={{
-                    fg: {
-                      connected: theme.success,
-                      error: theme.error,
-                    }[item.status],
-                  }}
-                >
-                  •
-                </text>
-                <text fg={theme.text} wrapMode="word">
-                  <b>{item.id}</b> <span style={{ fg: theme.textMuted }}>{item.root}</span>
-                </text>
-              </box>
-            )}
-          </For>
-        </box>
-      )}
-      <Show when={enabledFormatters().length > 0} fallback={<text fg={theme.text}>No Formatters</text>}>
-        <box>
-          <text fg={theme.text}>{enabledFormatters().length} Formatters</text>
-          <For each={enabledFormatters()}>
-            {(item) => (
-              <box flexDirection="row" gap={1}>
-                <text
-                  flexShrink={0}
-                  style={{
-                    fg: theme.success,
-                  }}
-                >
-                  •
-                </text>
-                <text wrapMode="word" fg={theme.text}>
-                  <b>{item.name}</b>
-                </text>
-              </box>
-            )}
-          </For>
-        </box>
-      </Show>
-      <Show when={plugins().length > 0} fallback={<text fg={theme.text}>No Plugins</text>}>
-        <box>
-          <text fg={theme.text}>{plugins().length} Plugins</text>
-          <For each={plugins()}>
-            {(item) => (
-              <box flexDirection="row" gap={1}>
-                <text
-                  flexShrink={0}
-                  style={{
-                    fg: theme.success,
-                  }}
-                >
-                  •
-                </text>
-                <text wrapMode="word" fg={theme.text}>
-                  <b>{item.name}</b>
-                  {item.version && <span style={{ fg: theme.textMuted }}> @{item.version}</span>}
-                </text>
-              </box>
-            )}
-          </For>
+      <scrollbox
+        gap={1}
+        paddingLeft={2}
+        paddingRight={2}
+        ref={(r: ScrollBoxRenderable) => (scroll = r)}
+        maxHeight={height()}
+      >
+        <box gap={1}>
+          <Show when={Object.keys(sync.data.mcp).length > 0} fallback={<text fg={theme.text}>No MCP Servers</text>}>
+            <box>
+              <text fg={theme.text}>{Object.keys(sync.data.mcp).length} MCP Servers</text>
+              <For each={Object.entries(sync.data.mcp)}>
+                {([key, item]) => (
+                  <box flexDirection="row" gap={1}>
+                    <text
+                      flexShrink={0}
+                      style={{
+                        fg: (
+                          {
+                            connected: theme.success,
+                            failed: theme.error,
+                            disabled: theme.textMuted,
+                            needs_auth: theme.warning,
+                            needs_client_registration: theme.error,
+                          } as Record<string, typeof theme.success>
+                        )[item.status],
+                      }}
+                    >
+                      •
+                    </text>
+                    <text fg={theme.text} wrapMode="word">
+                      <b>{key}</b>{" "}
+                      <span style={{ fg: theme.textMuted }}>
+                        <Switch fallback={item.status}>
+                          <Match when={item.status === "connected"}>Connected</Match>
+                          <Match when={item.status === "failed" && item}>{(val) => val().error}</Match>
+                          <Match when={item.status === "disabled"}>Disabled in configuration</Match>
+                          <Match when={(item.status as string) === "needs_auth"}>
+                            Needs authentication (run: opencode mcp auth {key})
+                          </Match>
+                          <Match when={(item.status as string) === "needs_client_registration" && item}>
+                            {(val) => (val() as { error: string }).error}
+                          </Match>
+                        </Switch>
+                      </span>
+                    </text>
+                  </box>
+                )}
+              </For>
+            </box>
+          </Show>
+          {sync.data.lsp.length > 0 && (
+            <box>
+              <text fg={theme.text}>{sync.data.lsp.length} LSP Servers</text>
+              <For each={sync.data.lsp}>
+                {(item) => (
+                  <box flexDirection="row" gap={1}>
+                    <text
+                      flexShrink={0}
+                      style={{
+                        fg: {
+                          connected: theme.success,
+                          error: theme.error,
+                        }[item.status],
+                      }}
+                    >
+                      •
+                    </text>
+                    <text fg={theme.text} wrapMode="word">
+                      <b>{item.id}</b> <span style={{ fg: theme.textMuted }}>{item.root}</span>
+                    </text>
+                  </box>
+                )}
+              </For>
+            </box>
+          )}
+          <Show when={enabledFormatters().length > 0} fallback={<text fg={theme.text}>No Formatters</text>}>
+            <box>
+              <text fg={theme.text}>{enabledFormatters().length} Formatters</text>
+              <For each={enabledFormatters()}>
+                {(item) => (
+                  <box flexDirection="row" gap={1}>
+                    <text
+                      flexShrink={0}
+                      style={{
+                        fg: theme.success,
+                      }}
+                    >
+                      •
+                    </text>
+                    <text wrapMode="word" fg={theme.text}>
+                      <b>{item.name}</b>
+                    </text>
+                  </box>
+                )}
+              </For>
+            </box>
+          </Show>
+          <Show when={plugins().length > 0} fallback={<text fg={theme.text}>No Plugins</text>}>
+            <box>
+              <text fg={theme.text}>{plugins().length} Plugins</text>
+              <For each={plugins()}>
+                {(item) => (
+                  <box flexDirection="row" gap={1}>
+                    <text
+                      flexShrink={0}
+                      style={{
+                        fg: theme.success,
+                      }}
+                    >
+                      •
+                    </text>
+                    <text wrapMode="word" fg={theme.text}>
+                      <b>{item.name}</b>
+                      {item.version && <span style={{ fg: theme.textMuted }}> @{item.version}</span>}
+                    </text>
+                  </box>
+                )}
+              </For>
+            </box>
+          </Show>
         </box>
-      </Show>
+      </scrollbox>
     </box>
   )
 }