diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 1ecfaaf1f47..c39a3f3acdb 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -628,9 +628,15 @@ export function Autocomplete(props: {
             return
           }
           if (name === "return") {
-            select()
-            e.preventDefault()
-            return
+            const selected = options()[store.selected]
+            if (selected) {
+              select()
+              e.preventDefault()
+              return
+            }
+            if (options().length === 0) {
+              hide()
+            }
           }
           if (name === "tab") {
             const selected = options()[store.selected]