diff --git a/src/components/SearchModal.tsx b/src/components/SearchModal.tsx
index 8f1c70c7..f78af36d 100644
--- a/src/components/SearchModal.tsx
+++ b/src/components/SearchModal.tsx
@@ -421,7 +421,10 @@ const Hit = ({
     }
   }
 
-  const handleClick = () => {
+  const handleClick = (event: React.MouseEvent<HTMLAnchorElement>) => {
+    if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
+      return
+    }
     closeSearch()
   }
 
@@ -779,6 +782,22 @@ export function SearchModal() {
     }
   }, [isOpen])
 
+  React.useEffect(() => {
+    if (!isOpen) return
+
+    const focusSearchInput = () => {
+      const input = containerRef.current?.querySelector<HTMLInputElement>(
+        'input[type="search"]',
+      )
+      input?.focus()
+    }
+
+    const id = window.requestAnimationFrame(() => {
+      window.requestAnimationFrame(focusSearchInput)
+    })
+    return () => window.cancelAnimationFrame(id)
+  }, [isOpen])
+
   const focusedIndexRef = React.useRef(focusedIndex)
 
   React.useEffect(() => {
@@ -832,6 +851,7 @@ export function SearchModal() {
           className="fixed z-[1000] top-8 left-1/2 -translate-x-1/2 w-[98%] xl:w-full max-w-3xl text-left bg-white/80 dark:bg-black/80 shadow-lg rounded-lg xl:rounded-xl divide-y divide-gray-500/20 backdrop-blur-lg dark:border dark:border-white/20 outline-none"
           ref={containerRef}
           onKeyDown={handleKeyDown}
+          onOpenAutoFocus={(event) => event.preventDefault()}
         >
           <DialogPrimitive.Title className="sr-only">
             Search TanStack docs
@@ -856,8 +876,6 @@ export function SearchModal() {
                     reset: 'p-1 opacity-50 hover:opacity-100',
                   }}
                   resetIconComponent={resetIconComponent}
-                  // eslint-disable-next-line jsx-a11y/no-autofocus
-                  autoFocus
                 />
               </div>
               <SearchResults focusedIndex={focusedIndex} />