diff --git a/frontend/src/app/main/ui/shapes/text.cljs b/frontend/src/app/main/ui/shapes/text.cljs
index 05c0afda4..6124f4575 100644
--- a/frontend/src/app/main/ui/shapes/text.cljs
+++ b/frontend/src/app/main/ui/shapes/text.cljs
@@ -88,7 +88,7 @@
   [props ref]
   (let [shape     (unchecked-get props "shape")
         selected? (unchecked-get props "selected?")
-        grow-type (:grow-type shape)
+        grow-type (unchecked-get props "grow-type")
         {:keys [id x y width height content]} shape]
     [:foreignObject {:x x
                      :y y
@@ -97,7 +97,6 @@
                      :transform (geom/transform-matrix shape)
                      :width  (if (#{:auto-width} grow-type) 10000 width)
                      :height (if (#{:auto-height :auto-width} grow-type) 10000 height)
-                     :ref ref
-                     :pointer-events "none"}
+                     :ref ref}
      [:& text-content {:shape shape
                        :content (:content shape)}]]))
diff --git a/frontend/src/app/main/ui/workspace/shapes/text.cljs b/frontend/src/app/main/ui/workspace/shapes/text.cljs
index d122c694d..47ce0fc57 100644
--- a/frontend/src/app/main/ui/workspace/shapes/text.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/text.cljs
@@ -110,10 +110,12 @@
       [:& text/text-shape {:key (str "text-shape" (:id shape))
                            :ref text-ref-cb
                            :shape shape
-                           :selected? selected?}]]
+                           :selected? selected?
+                           :grow-type (:grow-type shape)}]]
      (when edition?
-       [:& editor/text-shape-edit {:key (str "editor" (:id shape))
-                                   :shape shape}])
+       [:g {:pointer-events "none"}
+        [:& editor/text-shape-edit {:key (str "editor" (:id shape))
+                                    :shape shape}]])
 
      (when-not edition?
        [:rect.text-actions