diff --git a/src/main/frontend/modules/shortcut/before.cljs b/src/main/frontend/modules/shortcut/before.cljs
index bf573cd748..ab25ba4e24 100644
--- a/src/main/frontend/modules/shortcut/before.cljs
+++ b/src/main/frontend/modules/shortcut/before.cljs
@@ -33,7 +33,7 @@
 (defn enable-when-not-component-editing!
   [f]
   (fn [e]
-    (when (or (contains? #{:srs} (state/get-modal-id))
-              (not (state/block-component-editing?))
-              (not (whiteboard/tldraw-idle?)))
+    (when (and (or (contains? #{:srs} (state/get-modal-id))
+                   (not (state/block-component-editing?)))
+               (not (whiteboard/tldraw-idle?)))
       (f e))))