diff --git a/CHANGES.md b/CHANGES.md
index fdf35b5cbd..dc2d14a60b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@
 
 - Fix component "broken" after switch variant [Taiga #12984](https://tree.taiga.io/project/penpot/issue/12984)
 - Fix dashboard navigation tabs overlap with projects content when scrolling [Taiga #13962](https://tree.taiga.io/project/penpot/issue/13962)
+- Fix text editor v1 focus [Taiga #13961](https://tree.taiga.io/project/penpot/issue/13961)
 
 
 ## 2.14.2
diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs
index a7d6a9d4ca..f08c942c94 100644
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -81,7 +81,13 @@
     (effect [_ state _]
       (let [editor (:workspace-editor state)
             element (when editor (.-element editor))]
-        (when (and element (.-focus element))
+        (cond
+          ;; V1 (DraftEditor)
+          (.-focus editor)
+          (ts/schedule #(.focus ^js editor))
+
+          ;; V2
+          (and element (.-focus element))
           (ts/schedule #(.focus ^js element)))))))
 
 (defn gen-name