diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index 17816e907..67facdd71 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -3095,7 +3095,7 @@
         (state/selection?)
         (select-up-down direction)
 
-        :else
+        (not (state/get-edit-input-id))
         (select-first-last direction)))
     nil))