From a0accf190058a8a4241f6dbe0c85434ab6045270 Mon Sep 17 00:00:00 2001
From: Boris Verkhovskiy <boris.verk@gmail.com>
Date: Tue, 26 May 2026 19:14:25 -0600
Subject: [PATCH] Make shortcuts work on non-QWERTY keyboard

---
 packages/gitbook/src/components/AIChat/AIChat.tsx          | 4 +++-
 packages/gitbook/src/components/AIChat/AIChatInput.tsx     | 1 +
 packages/gitbook/src/components/Search/SearchContainer.tsx | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/gitbook/src/components/AIChat/AIChat.tsx b/packages/gitbook/src/components/AIChat/AIChat.tsx
index 4b7a235f14..4f048420e7 100644
--- a/packages/gitbook/src/components/AIChat/AIChat.tsx
+++ b/packages/gitbook/src/components/AIChat/AIChat.tsx
@@ -58,7 +58,9 @@ export function AIChat() {
         () => {
             chatController.close();
         },
-        []
+        {
+            useKey: true,
+        }
     );
 
     // Track the view of the AI chat
diff --git a/packages/gitbook/src/components/AIChat/AIChatInput.tsx b/packages/gitbook/src/components/AIChat/AIChatInput.tsx
index bb587e7ade..261eca707c 100644
--- a/packages/gitbook/src/components/AIChat/AIChatInput.tsx
+++ b/packages/gitbook/src/components/AIChat/AIChatInput.tsx
@@ -42,6 +42,7 @@ export function AIChatInput(props: {
         },
         {
             enableOnFormTags: true,
+            useKey: true,
         }
     );
 
diff --git a/packages/gitbook/src/components/Search/SearchContainer.tsx b/packages/gitbook/src/components/Search/SearchContainer.tsx
index 0e69119098..29f30daf94 100644
--- a/packages/gitbook/src/components/Search/SearchContainer.tsx
+++ b/packages/gitbook/src/components/Search/SearchContainer.tsx
@@ -69,6 +69,7 @@ export function SearchContainer({
         },
         {
             enableOnFormTags: true,
+            useKey: true,
         }
     );
 
@@ -84,6 +85,7 @@ export function SearchContainer({
         },
         {
             enableOnFormTags: true,
+            useKey: true,
         }
     );