diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index 69c87eed7..abd89b401 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -89,6 +89,13 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
 
   const selected = createMemo(() => flat()[store.selected])
 
+  createEffect(() => {
+    const currentIndex = flat().findIndex((x) => isDeepEqual(x.value, props.current))
+    if (currentIndex >= 0 && store.filter === "") {
+      setStore("selected", currentIndex)
+    }
+  })
+
   createEffect(() => {
     store.filter
     setStore("selected", 0)