diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
index 785eb7e4..cf497407 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -156,10 +156,11 @@ export function Prompt(props: PromptProps) {
         title: "Interrupt session",
         value: "session.interrupt",
         keybind: "session_interrupt",
+        disabled: status() !== "working",
         category: "Session",
-        disabled: true,
         onSelect: (dialog) => {
           if (!props.sessionID) return
+          if (autocomplete.visible) return
           sdk.client.session.abort({
             path: {
               id: props.sessionID,
@@ -602,16 +603,6 @@ export function Prompt(props: PromptProps) {
                   )
                     input.cursorOffset = input.plainText.length
                 }
-                if (!autocomplete.visible) {
-                  if (keybind.match("session_interrupt", e) && props.sessionID) {
-                    sdk.client.session.abort({
-                      path: {
-                        id: props.sessionID,
-                      },
-                    })
-                    return
-                  }
-                }
               }}
               onSubmit={submit}
               onPaste={async (event: PasteEvent) => {