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"
               >