diff --git a/common/src/app/common/files/libraries_helpers.cljc b/common/src/app/common/files/libraries_helpers.cljc
index 5aa612a52..dc4c152ec 100644
--- a/common/src/app/common/files/libraries_helpers.cljc
+++ b/common/src/app/common/files/libraries_helpers.cljc
@@ -34,6 +34,23 @@
 ;; Change this to :info :debug or :trace to debug this module, or :warn to reset to default
 (log/set-level! :warn)
 
+(defn generate-update-shapes
+[changes ids update-fn objects {:keys [attrs ignore-tree ignore-touched with-objects?]}]
+  (let [changes   (reduce
+                   (fn [changes id]
+                     (let [opts {:attrs attrs
+                                 :ignore-geometry? (get ignore-tree id)
+                                 :ignore-touched ignore-touched
+                                 :with-objects? with-objects?}]
+                       (pcb/update-shapes changes [id] update-fn (d/without-nils opts))))
+                   (-> changes
+                       (pcb/with-objects objects))
+                   ids)
+        grid-ids (->> ids (filter (partial ctl/grid-layout? objects)))
+        changes (pcb/update-shapes changes grid-ids ctl/assign-cell-positions {:with-objects? true})
+        changes (pcb/reorder-grid-children changes ids)]
+    changes))
+
 (declare generate-sync-container)
 (declare generate-sync-shape)
 (declare generate-sync-text-shape)
diff --git a/frontend/src/app/main/data/workspace/changes.cljs b/frontend/src/app/main/data/workspace/changes.cljs
index b2d595086..c1e0bb04f 100644
--- a/frontend/src/app/main/data/workspace/changes.cljs
+++ b/frontend/src/app/main/data/workspace/changes.cljs
@@ -12,6 +12,7 @@
    [app.common.files.changes :as cpc]
    [app.common.files.changes-builder :as pcb]
    [app.common.files.helpers :as cph]
+   [app.common.files.libraries-helpers :as cflh]
    [app.common.logging :as log]
    [app.common.schema :as sm]
    [app.common.types.shape-tree :as ctst]
@@ -74,23 +75,19 @@
                   (filter #(some update-layout-attr? (pcb/changed-attrs % objects update-fn {:attrs attrs :with-objects? with-objects?})))
                   (map :id))
 
-             changes   (reduce
-                        (fn [changes id]
-                          (let [opts {:attrs attrs
-                                      :ignore-geometry? (get ignore-tree id)
-                                      :ignore-touched ignore-touched
-                                      :with-objects? with-objects?}]
-                            (pcb/update-shapes changes [id] update-fn (d/without-nils opts))))
-                        (-> (pcb/empty-changes it page-id)
-                            (pcb/set-save-undo? save-undo?)
-                            (pcb/set-stack-undo? stack-undo?)
-                            (pcb/with-objects objects)
-                            (cond-> undo-group
-                              (pcb/set-undo-group undo-group)))
-                        ids)
-             grid-ids (->> ids (filter (partial ctl/grid-layout? objects)))
-             changes (pcb/update-shapes changes grid-ids ctl/assign-cell-positions {:with-objects? true})
-             changes (pcb/reorder-grid-children changes ids)
+             changes (-> (pcb/empty-changes it page-id)
+                         (pcb/set-save-undo? save-undo?)
+                         (pcb/set-stack-undo? stack-undo?)
+                         (cflh/generate-update-shapes ids
+                                                      update-fn
+                                                      objects
+                                                      {:attrs attrs
+                                                       :ignore-tree ignore-tree
+                                                       :ignore-touched ignore-touched
+                                                       :with-objects? with-objects?})
+                         (cond-> undo-group
+                           (pcb/set-undo-group undo-group)))
+
              changes (add-undo-group changes state)]
          (rx/concat
           (if (seq (:redo-changes changes))