diff --git a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx b/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx
index 9f1e5c358..dd1ef7996 100644
--- a/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/SearchPlugin/SearchPlugin.tsx
@@ -27,12 +27,6 @@ export const SearchPlugin = () => {
   const isCaseSensitiveRef = useStateRef(isCaseSensitive)
   const resultsRef = useStateRef(results)
 
-  useEffect(() => {
-    if (!isSearchActive) {
-      editor.focus()
-    }
-  }, [editor, isSearchActive])
-
   useEffect(() => {
     const isFocusInEditor = () => {
       if (!document.activeElement || !document.activeElement.closest('.blocks-editor')) {
@@ -51,6 +45,7 @@ export const SearchPlugin = () => {
           event.preventDefault()
           event.stopPropagation()
           dispatch({ type: 'toggle-search' })
+          editor.focus()
         },
       },
       {