diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx
index 26c9d14f..e3b13f51 100644
--- a/packages/cli/src/ui/components/InputPrompt.tsx
+++ b/packages/cli/src/ui/components/InputPrompt.tsx
@@ -189,6 +189,10 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           return true;
         }
         if (key.escape) {
+          if (shellModeActive) {
+            setShellModeActive(false);
+            return;
+          }
           completion.resetCompletionState();
           return;
         }
diff --git a/packages/cli/src/ui/components/ShellModeIndicator.tsx b/packages/cli/src/ui/components/ShellModeIndicator.tsx
index e4147035..612af1a6 100644
--- a/packages/cli/src/ui/components/ShellModeIndicator.tsx
+++ b/packages/cli/src/ui/components/ShellModeIndicator.tsx
@@ -12,7 +12,7 @@ export const ShellModeIndicator: React.FC = () => (
   <Box>
     <Text color={Colors.AccentYellow}>
       shell mode enabled
-      <Text color={Colors.SubtleComment}> (! to toggle)</Text>
+      <Text color={Colors.SubtleComment}> (esc to disable)</Text>
     </Text>
   </Box>
 );