From f3b369f88aed15a6253fab3d53bcb05768768eb2 Mon Sep 17 00:00:00 2001
From: Rhys Sullivan <rhys@rhyssullivan.com>
Date: Fri, 14 Aug 2026 02:06:50 -0700
Subject: [PATCH] Only trigger slash search shortcut outside editable fields

---
 packages/react/src/components/tool-tree.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/components/tool-tree.tsx b/packages/react/src/components/tool-tree.tsx
index 9467ddd8ec..f0fa20e6f2 100644
--- a/packages/react/src/components/tool-tree.tsx
+++ b/packages/react/src/components/tool-tree.tsx
@@ -352,8 +352,20 @@ export function ToolTree(props: {
 
   // Keyboard shortcuts — `/` focuses search, Escape clears
   useEffect(() => {
+    const isEditing = (el: Element | null) =>
+      el instanceof HTMLElement &&
+      (el.isContentEditable ||
+        el.tagName === "INPUT" ||
+        el.tagName === "TEXTAREA" ||
+        el.tagName === "SELECT");
     const handler = (e: KeyboardEvent) => {
-      if (e.key === "/" && document.activeElement?.tagName !== "INPUT") {
+      if (
+        e.key === "/" &&
+        !e.metaKey &&
+        !e.ctrlKey &&
+        !e.altKey &&
+        !isEditing(document.activeElement)
+      ) {
         e.preventDefault();
         searchRef.current?.focus();
       }