diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index 8b42529a41..2b9db4f14f 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -2327,7 +2327,8 @@
           value (gobj/get input "value")
           c (util/nth-safe value (dec current-pos))]
       (when-not (state/get-editor-show-input)
-        (when (= c " ")
+        (when (and (= c " ")
+                   (not (state/get-editor-show-page-search?)))
           (state/set-editor-show-page-search-hashtag! false))
 
         (when (and @*show-commands (not= key-code 191)) ; not /
diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs
index 49236870f3..7309ab44ac 100644
--- a/src/main/frontend/state.cljs
+++ b/src/main/frontend/state.cljs
@@ -467,14 +467,15 @@
   [value]
   (set-state! :editor/show-page-search? value)
   (set-state! :editor/show-page-search-hashtag? false))
-(defn set-editor-show-page-search-hashtag!
-  [value]
-  (set-state! :editor/show-page-search? value)
-  (set-state! :editor/show-page-search-hashtag? value))
 
 (defn get-editor-show-page-search?
   []
   (get @state :editor/show-page-search?))
+
+(defn set-editor-show-page-search-hashtag!
+  [value]
+  (set-state! :editor/show-page-search? value)
+  (set-state! :editor/show-page-search-hashtag? value))
 (defn get-editor-show-page-search-hashtag?
   []
   (get @state :editor/show-page-search-hashtag?))