diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs
index 5043bd4543..e8ed5288cb 100644
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -106,8 +106,10 @@
   (ptk/reify ::focus-editor
     ptk/EffectEvent
     (effect [_ state _]
-      (when-let [editor (:workspace-editor state)]
-        (ts/schedule #(.focus ^js editor))))))
+      (let [editor (:workspace-editor state)
+            element (when editor (.-element editor))]
+        (when (and element (.-focus element))
+          (ts/schedule #(.focus ^js element)))))))
 
 (defn gen-name
   [editor]