diff --git a/CHANGES.md b/CHANGES.md
index 3a4da21ef..5730c9942 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,6 +30,7 @@
 - Fix ldap function called on login click
 - Fix logo icon in viewer should go to dashboard [Taiga #1149](https://tree.taiga.io/project/penpot/issue/1149)
 - Fix ordering when restoring deleted shapes in sync [Taiga #1163](https://tree.taiga.io/project/penpot/issue/1163)
+- Fix problem when editing text immediately after creating [Taiga #1207](https://tree.taiga.io/project/penpot/issue/1207)
 - Fix problem when pasting URL's copied from the browser url bar [Taiga #1187](https://tree.taiga.io/project/penpot/issue/1187)
 - Fix problem with multiple selection and groups [Taiga #1128](https://tree.taiga.io/project/penpot/issue/1128)
 - Fix problem with red handler indicator on resize [Taiga #1188](https://tree.taiga.io/project/penpot/issue/1188)
@@ -39,7 +40,6 @@
 - Fix updates on collaborative editing not updating selection rectangles [Taiga #1127](https://tree.taiga.io/project/penpot/issue/1127)
 - Make the team deletion deferred (in the same way other objects)
 
-
 ### Community contributions by (Thank you! :heart:)
 
 - abtinmo [#538](https://github.com/penpot/penpot/pull/538)
diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs
index 74d35c0d5..f2bf529bb 100644
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -96,6 +96,9 @@
 (def current-hover
   (l/derived :hover workspace-local))
 
+(def editors
+  (l/derived :editors workspace-local))
+
 (def workspace-layout
   (l/derived :workspace-layout st/state))
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/text.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/text.cljs
index 0bbf925ab..3cdb576a0 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/text.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/text.cljs
@@ -285,8 +285,8 @@
   (let [ids [(:id shape)]
         type (:type shape)
 
-        local (deref refs/workspace-local)
-        editor (get-in local [:editors (:id shape)])
+        editors (mf/deref refs/editors)
+        editor (get editors (:id shape))
 
         measure-values (select-keys shape measure-attrs)