diff --git a/frontend/src/app/main/ui.cljs b/frontend/src/app/main/ui.cljs
index 8a8ea4b9e..8d194113c 100644
--- a/frontend/src/app/main/ui.cljs
+++ b/frontend/src/app/main/ui.cljs
@@ -171,9 +171,9 @@
 
      :render-object
      (do
-       (let [file-id   (uuid (get-in route [:params :path :file-id]))
-             page-id   (uuid (get-in route [:params :path :page-id]))
-             object-id (uuid (get-in route [:params :path :object-id]))]
+       (let [file-id   (uuid (get-in route [:path-params :file-id]))
+             page-id   (uuid (get-in route [:path-params :page-id]))
+             object-id (uuid (get-in route [:path-params :object-id]))]
          [:& render/render-object {:file-id file-id
                                    :page-id page-id
                                    :object-id object-id}]))
diff --git a/frontend/src/app/main/ui/shapes/text.cljs b/frontend/src/app/main/ui/shapes/text.cljs
index 266dc6601..bfffea013 100644
--- a/frontend/src/app/main/ui/shapes/text.cljs
+++ b/frontend/src/app/main/ui/shapes/text.cljs
@@ -94,6 +94,7 @@
         {:keys [id x y width height content]} shape]
     [:foreignObject {:x x
                      :y y
+                     :id (:id shape)
                      :data-colors (retrieve-colors shape)
                      :transform (geom/transform-matrix shape)
                      :width  (if (#{:auto-width} grow-type) 10000 width)