diff --git a/client/web/compose/src/components/Common/Grid.vue b/client/web/compose/src/components/Common/Grid.vue
index 1a44e2476..3fe27a54d 100644
--- a/client/web/compose/src/components/Common/Grid.vue
+++ b/client/web/compose/src/components/Common/Grid.vue
@@ -125,17 +125,14 @@ export default {
           return meta.hidden ? { i, x: 0, y: 0, w: 0, h: 0 } : { i, x, y, w, h }
         })
 
-        // Only use next tick if previous layout exists and not editing
         if (this.layout.length && !this.editable) {
           this.layout = []
-
-          // Next tick is important, otherwise it can lead to overlapping blocks
-          this.$nextTick(() => {
-            this.layout = blocks
-          })
-        } else {
-          this.layout = blocks
         }
+
+        // Next tick is important, otherwise it can lead to overlapping blocks
+        this.$nextTick(() => {
+          this.layout = blocks
+        })
       },
     },
   },