diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 30e2e8ec2..d4f4ce663 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -501,6 +501,12 @@
                                       :hover-top-frame-id @hover-top-frame-id
                                       :zoom zoom}])
 
+       (when (debug? :grid-layout)
+         [:& wvd/debug-grid-layout {:selected-shapes selected-shapes
+                                    :objects base-objects
+                                    :hover-top-frame-id @hover-top-frame-id
+                                    :zoom zoom}])
+
        (when show-selection-handlers?
          [:g.selection-handlers {:clipPath "url(#clip-handlers)"}
           [:defs
diff --git a/frontend/src/app/main/ui/workspace/viewport/debug.cljs b/frontend/src/app/main/ui/workspace/viewport/debug.cljs
index 3842e7290..ada80994d 100644
--- a/frontend/src/app/main/ui/workspace/viewport/debug.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/debug.cljs
@@ -11,6 +11,7 @@
    [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as gsh]
    [app.common.geom.shapes.flex-layout :as gsl]
+   [app.common.geom.shapes.grid-layout :as gsg]
    [app.common.geom.shapes.points :as gpo]
    [app.common.pages.helpers :as cph]
    [app.common.types.shape.layout :as ctl]
@@ -195,3 +196,51 @@
                           :cy (:y point)
                           :r (/ 2 zoom)
                           :style {:fill "red"}}]))])]))))
+
+(mf/defc debug-grid-layout
+  {::mf/wrap-props false}
+  [props]
+
+  (let [objects            (unchecked-get props "objects")
+        zoom               (unchecked-get props "zoom")
+        selected-shapes    (unchecked-get props "selected-shapes")
+        hover-top-frame-id (unchecked-get props "hover-top-frame-id")
+
+        selected-frame
+        (when (and (= (count selected-shapes) 1) (= :frame (-> selected-shapes first :type)))
+          (first selected-shapes))
+
+        parent (or selected-frame (get objects hover-top-frame-id))
+        parent-bounds (:points parent)]
+
+    (when (and (some? parent) (not= uuid/zero (:id parent)))
+      (let [children (->> (cph/get-immediate-children objects (:id parent))
+                          (remove :hidden))
+
+            hv   #(gpo/start-hv parent-bounds %)
+            vv   #(gpo/start-vv parent-bounds %)
+
+            width (gpo/width-points parent-bounds)
+            height (gpo/height-points parent-bounds)
+            origin (gpo/origin parent-bounds)
+            
+            grid-layout (gsg/calc-layout-data parent children parent-bounds)]
+
+        [:*
+         (for [row-data (:row-lines grid-layout)]
+           (let [start-p (gpt/add origin (vv (:distance row-data)))
+                 end-p (gpt/add start-p (hv width))]
+             [:line {:x1 (:x start-p)
+                     :y1 (:y start-p)
+                     :x2 (:x end-p)
+                     :y2 (:y end-p)
+                     :style {:stroke "red"}}]))
+
+         (for [column-data (:column-lines grid-layout)]
+           (let [start-p (gpt/add origin (hv (:distance column-data)))
+                 end-p (gpt/add start-p (vv height))]
+             [:line {:x1 (:x start-p)
+                     :y1 (:y start-p)
+                     :x2 (:x end-p)
+                     :y2 (:y end-p)
+                     :style {:stroke "red"}}]))]))))
diff --git a/frontend/src/debug.cljs b/frontend/src/debug.cljs
index b663cdc49..c306f5820 100644
--- a/frontend/src/debug.cljs
+++ b/frontend/src/debug.cljs
@@ -95,6 +95,9 @@
 
     ;; Show shape name and id
     :shape-titles
+
+    ;;
+    :grid-layout
     })
 
 ;; These events are excluded when we activate the :events flag