diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index 0be02a90bf..d5c720207d 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -2725,19 +2725,21 @@
                                         #{"`"})
                         key)
              (= (get-current-input-char input) key))
-        (do (util/stop e)
-            (cursor/move-cursor-forward input))
+        (do
+          (util/stop e)
+          (cursor/move-cursor-forward input))
 
         (and (autopair-when-selected key) (string/blank? (util/get-selected-text)))
         nil
 
-        (some? (:editor/action @state/state))
+        (some? @(:editor/action @state/state))
         nil
 
         (and (not (string/blank? (util/get-selected-text)))
              (contains? keycode/left-square-brackets-keys key))
-        (do (autopair input-id "[" format nil)
-            (util/stop e))
+        (do
+          (autopair input-id "[" format nil)
+          (util/stop e))
 
         (and (not (string/blank? (util/get-selected-text)))
              (contains? keycode/left-paren-keys key))
diff --git a/src/main/frontend/handler/editor/impl.cljs b/src/main/frontend/handler/editor/impl.cljs
index 03a0d758ec..f27601f6e4 100644
--- a/src/main/frontend/handler/editor/impl.cljs
+++ b/src/main/frontend/handler/editor/impl.cljs
@@ -1,11 +1,11 @@
 (ns frontend.handler.editor.impl
-  (:require [frontend.db.react :as react]
+  (:require [frontend.config :as config]
             [frontend.handler.editor.impl.file :as file]
             [frontend.handler.editor.impl.db :as db]
             [frontend.state :as state]))
 
 (defn wrap-parse-block
   [block]
-  (if (react/db-graph? (state/get-current-repo))
+  (if (config/db-based-graph? (state/get-current-repo))
     (db/wrap-parse-block block)
     (file/wrap-parse-block block)))