diff --git a/packages/tui/src/component/dialog-status.tsx b/packages/tui/src/component/dialog-status.tsx
index f94f906cdf9d..678b4c754dd7 100644
--- a/packages/tui/src/component/dialog-status.tsx
+++ b/packages/tui/src/component/dialog-status.tsx
@@ -1,5 +1,5 @@
import { useTheme } from "../context/theme"
-import { DialogHeader, DialogLayout } from "../ui/dialog"
+import { DIALOG_LIST_INSET, DialogHeader, DialogLayout } from "../ui/dialog"
import { useData } from "../context/data"
import { For, Match, Switch, Show, createMemo } from "solid-js"
@@ -15,7 +15,7 @@ export function DialogStatus() {
return theme.text.muted
}
return (
- }>
+ }>
0} fallback={No MCP servers}>
diff --git a/packages/tui/test/component/dialog-status.test.tsx b/packages/tui/test/component/dialog-status.test.tsx
new file mode 100644
index 000000000000..e687fed8435c
--- /dev/null
+++ b/packages/tui/test/component/dialog-status.test.tsx
@@ -0,0 +1,25 @@
+import { expect, test } from "bun:test"
+import { DialogStatus } from "../../src/component/dialog-status"
+import { DialogSelect } from "../../src/ui/dialog-select"
+import { renderLocal } from "../fixture/local"
+
+test("status aligns its title, body and escape hint with pickers", async () => {
+ await using setup = await renderLocal()
+ setup.dialog.replace(() => )
+ await setup.renderOnce()
+ const picker = setup
+ .captureCharFrame()
+ .split("\n")
+ .find((line) => line.includes("Models"))!
+ expect(picker).toContain("esc")
+
+ setup.dialog.replace(() => )
+ await setup.renderOnce()
+ const lines = setup.captureCharFrame().split("\n")
+ const header = lines.find((line) => line.includes("Status"))!
+ const body = lines.find((line) => line.includes("No MCP servers"))
+ expect(header).toContain("esc")
+ expect(header.indexOf("Status")).toBe(picker.indexOf("Models"))
+ expect(header.indexOf("esc")).toBe(picker.indexOf("esc"))
+ expect(body?.indexOf("No MCP servers")).toBe(picker.indexOf("Models"))
+})