From be9391caec703f9158bab2b86e5395a5c6a391a0 Mon Sep 17 00:00:00 2001
From: Jaime Idolpx <jaime@idolpx.com>
Date: Sun, 14 Jun 2026 03:24:09 -0400
Subject: [PATCH] fix(SearchAssembly64): streamline query update and focus
 handling in AQL help dialog

---
 src/app/components/SearchAssembly64.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/app/components/SearchAssembly64.tsx b/src/app/components/SearchAssembly64.tsx
index aec668c..b248744 100644
--- a/src/app/components/SearchAssembly64.tsx
+++ b/src/app/components/SearchAssembly64.tsx
@@ -590,12 +590,16 @@ export default function SearchAssembly64({ config, setConfig, onClose: _onClose
               <button
                 key={term}
                 onClick={() => {
-                  setQuery(q => {
-                    const trimmed = q.trimEnd();
-                    return trimmed ? `${trimmed} ${term}` : term;
-                  });
+                  const trimmed = query.trimEnd();
+                  const next = trimmed ? `${trimmed} ${term}` : term;
+                  setQuery(next);
                   setShowAqlHelp(false);
-                  setTimeout(() => inputRef.current?.focus(), 50);
+                  setTimeout(() => {
+                    const el = inputRef.current;
+                    if (!el) return;
+                    el.focus();
+                    el.setSelectionRange(next.length, next.length);
+                  }, 50);
                 }}
                 className="w-full text-left px-4 py-3 rounded-lg border border-neutral-200 hover:bg-blue-50 hover:border-blue-300 transition-colors"
               >