From 97e9b262515cf461504fc7432bf7765c3a910c65 Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Sat, 14 Mar 2026 00:14:37 +0100
Subject: [PATCH] Update keydown event handling in src/App.tsx

---
 src/App.tsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index a1e8572..3a4d14b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2244,12 +2244,13 @@ export default function App() {
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if (event.defaultPrevented) return;
-      if (customPromptOpen && event.key === "Escape") {
+      if ((customPromptState || pendingAiScopeChoice) && event.key === "Escape") {
         event.preventDefault();
-        setCustomPromptOpen(false);
+        setCustomPromptState(null);
+        setPendingAiScopeChoice(null);
         return;
       }
-      if (customPromptOpen) {
+      if (customPromptState || pendingAiScopeChoice) {
         return;
       }
       const isFind =
@@ -2277,7 +2278,14 @@ export default function App() {
 
     window.addEventListener("keydown", handleKeyDown);
     return () => window.removeEventListener("keydown", handleKeyDown);
-  }, [confirmState, customPromptOpen, handleSaveVersion, openDocumentSearch, settingsOpen]);
+  }, [
+    confirmState,
+    customPromptState,
+    handleSaveVersion,
+    openDocumentSearch,
+    pendingAiScopeChoice,
+    settingsOpen
+  ]);
 
   const renderTextItem = (text: Text) => (
     <div