From 2b61ac532d07681598d6b475fcf35df35ad13b59 Mon Sep 17 00:00:00 2001
From: JAYADITYA <96861162+JayadityaGit@users.noreply.github.com>
Date: Fri, 17 Oct 2025 23:52:54 +0530
Subject: [PATCH] feat: add missing visual cue for closing dialogs with Esc key
 (#11386)

---
 packages/cli/src/ui/auth/AuthDialog.tsx                       | 4 +++-
 packages/cli/src/ui/components/EditorSettingsDialog.tsx       | 2 +-
 .../cli/src/ui/components/PermissionsModifyTrustDialog.tsx    | 4 +++-
 packages/cli/src/ui/components/ThemeDialog.tsx                | 2 +-
 .../src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/ui/auth/AuthDialog.tsx b/packages/cli/src/ui/auth/AuthDialog.tsx
index 67d710d5a8..d705de508b 100644
--- a/packages/cli/src/ui/auth/AuthDialog.tsx
+++ b/packages/cli/src/ui/auth/AuthDialog.tsx
@@ -185,7 +185,9 @@ Logging in with Google... Please restart Gemini CLI to continue.
         </Box>
       )}
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>(Use Enter to select)</Text>
+        <Text color={theme.text.secondary}>
+          (Use Enter to select, Esc to close)
+        </Text>
       </Box>
       <Box marginTop={1}>
         <Text color={theme.text.primary}>
diff --git a/packages/cli/src/ui/components/EditorSettingsDialog.tsx b/packages/cli/src/ui/components/EditorSettingsDialog.tsx
index c09cbc47da..3e70207bcb 100644
--- a/packages/cli/src/ui/components/EditorSettingsDialog.tsx
+++ b/packages/cli/src/ui/components/EditorSettingsDialog.tsx
@@ -157,7 +157,7 @@ export function EditorSettingsDialog({
 
         <Box marginTop={1}>
           <Text color={theme.text.secondary}>
-            (Use Enter to select, Tab to change focus)
+            (Use Enter to select, Tab to change focus, Esc to close)
           </Text>
         </Box>
       </Box>
diff --git a/packages/cli/src/ui/components/PermissionsModifyTrustDialog.tsx b/packages/cli/src/ui/components/PermissionsModifyTrustDialog.tsx
index 78f1858a38..3814e9ecc6 100644
--- a/packages/cli/src/ui/components/PermissionsModifyTrustDialog.tsx
+++ b/packages/cli/src/ui/components/PermissionsModifyTrustDialog.tsx
@@ -114,7 +114,9 @@ export function PermissionsModifyTrustDialog({
           initialIndex={initialIndex}
         />
         <Box marginTop={1}>
-          <Text color={theme.text.secondary}>(Use Enter to select)</Text>
+          <Text color={theme.text.secondary}>
+            (Use Enter to select, Esc to close)
+          </Text>
         </Box>
       </Box>
       {needsRestart && (
diff --git a/packages/cli/src/ui/components/ThemeDialog.tsx b/packages/cli/src/ui/components/ThemeDialog.tsx
index 468ec88885..04ea2ad588 100644
--- a/packages/cli/src/ui/components/ThemeDialog.tsx
+++ b/packages/cli/src/ui/components/ThemeDialog.tsx
@@ -275,7 +275,7 @@ def fibonacci(n):
       <Box marginTop={1}>
         <Text color={theme.text.secondary} wrap="truncate">
           (Use Enter to {mode === 'theme' ? 'select' : 'apply scope'}, Tab to{' '}
-          {mode === 'theme' ? 'configure scope' : 'select theme'})
+          {mode === 'theme' ? 'configure scope' : 'select theme'}, Esc to close)
         </Text>
       </Box>
     </Box>
diff --git a/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
index b205bba4a5..5bf4fbb931 100644
--- a/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`ThemeDialog Snapshots > should render correctly in scope selector mode
 │   2. Workspace Settings                                                                          │
 │   3. System Settings                                                                             │
 │                                                                                                  │
-│ (Use Enter to apply scope, Tab to select theme)                                                  │
+│ (Use Enter to apply scope, Tab to select theme, Esc to close)                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -32,7 +32,7 @@ exports[`ThemeDialog Snapshots > should render correctly in theme selection mode
 │   12. Google Code Light                      └─────────────────────────────────────────────────┘ │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│ (Use Enter to select, Tab to configure scope, Esc to close)                                      │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;