diff --git a/CHANGES.md b/CHANGES.md
index 57c749035b..a976e1b8c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@
 ### :bug: Bugs fixed
 
 - Fix zooming while color picker breaks UI [GH #3214](https://github.com/penpot/penpot/issues/3214)
+- Fix problem with layout not reflowing on shape deletion [Taiga #5289](https://tree.taiga.io/project/penpot/issue/5289)
 
 ## 1.18.3
 
diff --git a/frontend/src/app/main/data/workspace/shapes.cljs b/frontend/src/app/main/data/workspace/shapes.cljs
index 17fd1bed8d..a806d51255 100644
--- a/frontend/src/app/main/data/workspace/shapes.cljs
+++ b/frontend/src/app/main/data/workspace/shapes.cljs
@@ -323,8 +323,8 @@
 
     (rx/of (dwu/start-undo-transaction undo-id)
            (dc/detach-comment-thread ids)
-           (ptk/data-event :layout/update all-parents)
            (dch/commit-changes changes)
+           (ptk/data-event :layout/update all-parents)
            (dwu/commit-undo-transaction undo-id))))
 
 (defn create-and-add-shape