diff --git a/packages/core-components/src/components/grid/grid.scss b/packages/core-components/src/components/grid/grid.scss
index 9ee639a9..4a7c3c6f 100644
--- a/packages/core-components/src/components/grid/grid.scss
+++ b/packages/core-components/src/components/grid/grid.scss
@@ -3,3 +3,17 @@
   margin: 0 auto;
   box-sizing: border-box;
 }
+
+:host(.b2b-grid-row) {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+:host(.b2b-grid-col) {
+  display: flex;
+  flex-direction: column;
+}
+
+.b2b-grid-col > .b2b-grid-row {
+  flex: 1;
+}
diff --git a/packages/core-components/src/components/grid/row.tsx b/packages/core-components/src/components/grid/row.tsx
index b1596115..29c5cf82 100644
--- a/packages/core-components/src/components/grid/row.tsx
+++ b/packages/core-components/src/components/grid/row.tsx
@@ -31,7 +31,7 @@ export class B2bGridRowComponent {
   }
 
   private adjustColumnFlex() {
-    const columns = this.hostElement.querySelectorAll('b2b-grid-col');
+    const columns = this.hostElement.querySelectorAll(':scope > b2b-grid-col');
     let totalSpan = 0;
     let columnsWithoutSpan: HTMLElement[] = [];
 
diff --git a/packages/core-components/src/html/dev-styles.css b/packages/core-components/src/html/dev-styles.css
index fca562f6..0dbfa1e5 100644
--- a/packages/core-components/src/html/dev-styles.css
+++ b/packages/core-components/src/html/dev-styles.css
@@ -85,6 +85,12 @@ h1 {
   height: 200px;
 }
 
+.grid-test-box--blue {
+  border: 1px solid black;
+  background-color: #78ace0;
+  height: 100%;
+}
+
 .grid-test-box--small {
   border: 1px solid black;
   padding: 0.75rem;
diff --git a/packages/core-components/src/html/utilities.html b/packages/core-components/src/html/utilities.html
index fb6114bb..c7d850d4 100644
--- a/packages/core-components/src/html/utilities.html
+++ b/packages/core-components/src/html/utilities.html
@@ -214,6 +214,24 @@ <h1>Grid Component</h1>
           ></b2b-grid-col>
           <b2b-grid-col><div class="grid-test-box"></div></b2b-grid-col>
         </b2b-grid-row>
+        <b2b-grid-row>
+          <b2b-grid-col>
+            <b2b-grid-row>
+              <b2b-grid-col
+                ><div class="grid-test-box--blue"></div
+              ></b2b-grid-col>
+              <b2b-grid-col><div class="grid-test-box"></div></b2b-grid-col>
+            </b2b-grid-row>
+          </b2b-grid-col>
+          <b2b-grid-col>
+            <b2b-grid-row>
+              <b2b-grid-col
+                ><div class="grid-test-box--blue"></div
+              ></b2b-grid-col>
+              <b2b-grid-col><div class="grid-test-box"></div></b2b-grid-col>
+            </b2b-grid-row>
+          </b2b-grid-col>
+        </b2b-grid-row>
       </b2b-grid>
     </div>
     <b2b-background-box fixed-width="true" no-padding="false">