diff --git a/web/src/components/SearchInputWithSpinner/SearchInputWithSpinner.tsx b/web/src/components/SearchInputWithSpinner/SearchInputWithSpinner.tsx
index 51fdc8e15..1bf36bead 100644
--- a/web/src/components/SearchInputWithSpinner/SearchInputWithSpinner.tsx
+++ b/web/src/components/SearchInputWithSpinner/SearchInputWithSpinner.tsx
@@ -56,7 +56,7 @@ export const SearchInputWithSpinner: React.FC<SearchInputWithSpinnerProps> = ({
           placeholder={placeholder || getString('search')}
           leftIcon={icon as IconName}
           style={{ width, height }}
-          autoFocus
+          autoFocus={!readOnly && !disabled}
           onFocus={event => event.target.select()}
           onInput={event => {
             setQuery(event.currentTarget.value || '')
diff --git a/web/src/pages/Repository/RepositoryContent/ContentHeader/ContentHeader.tsx b/web/src/pages/Repository/RepositoryContent/ContentHeader/ContentHeader.tsx
index 32383a5ef..ae1c6cc5a 100644
--- a/web/src/pages/Repository/RepositoryContent/ContentHeader/ContentHeader.tsx
+++ b/web/src/pages/Repository/RepositoryContent/ContentHeader/ContentHeader.tsx
@@ -63,7 +63,15 @@ export function ContentHeader({
     }
   }, [performSearch, search, searchSampleQueryIndex])
 
-  useHotkeys('ctrl+k', () => setShowSearchModal(true))
+  useHotkeys(
+    'ctrl+k',
+    () => {
+      if (!showSearchModal) {
+        setShowSearchModal(true)
+      }
+    },
+    [showSearchModal]
+  )
 
   const permPushResult = hooks?.usePermissionTranslate?.(
     {