diff --git a/CHANGES.md b/CHANGES.md
index 84aaa230f..0cc21cf35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@
 ### :bug: Bugs fixed
 
 - Fix issues on group rendering.
+- Fix problem with text editing auto-height [Taiga #1683](https://tree.taiga.io/project/penpot/issue/1683)
 
 
 ## 1.5.3-alpha
diff --git a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
index 036e07a92..1cdca4aaf 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
@@ -139,7 +139,9 @@
 
     [:div.text-editor
      {:ref self-ref
-      :style {:cursor cur/text}
+      :style {:cursor cur/text
+              :width (:width shape)
+              :height (:height shape)}
       :on-click (st/emitf (dwt/focus-editor))
       :class (dom/classnames
               :align-top    (= (:vertical-align content "top") "top")