diff --git a/core/themes/claro/css/layout/node-add.css b/core/themes/claro/css/layout/node-add.css
index 2df99258d9b6b48efa70e48e31fae71ac4d96ba7..46c4f8a673cfbe8a3b366f14c2b9cfe92898c714 100644
--- a/core/themes/claro/css/layout/node-add.css
+++ b/core/themes/claro/css/layout/node-add.css
@@ -19,18 +19,21 @@
 @media (min-width: 61rem) {
   .layout-node-form {
     display: grid;
+    grid-template-rows: auto 1fr;
     grid-template-columns: 3fr minmax(22.5rem, 1fr);
     gap: var(--space-l);
   }
 
   .layout-region--node-main,
   .layout-region--node-footer {
+    grid-column: 1;
     margin-inline: auto;
     width: min(52rem, 100%);
   }
 
   /* Push sidebar down to horizontal align with form section. */
   .layout-region--node-secondary {
+    grid-row: span 2;
     margin-block-start: var(--space-l);
   }
 }
diff --git a/core/themes/claro/css/layout/node-add.pcss.css b/core/themes/claro/css/layout/node-add.pcss.css
index 936f8908a9fd2f55be40b844f6372af46c4ccba6..f3c3e8587fa1ef4a6a5a06e287c26fe5e9623ffc 100644
--- a/core/themes/claro/css/layout/node-add.pcss.css
+++ b/core/themes/claro/css/layout/node-add.pcss.css
@@ -15,18 +15,21 @@
 @media (min-width: 61rem) {
   .layout-node-form {
     display: grid;
+    grid-template-rows: auto 1fr;
     grid-template-columns: 3fr minmax(360px, 1fr);
     gap: var(--space-l);
   }
 
   .layout-region--node-main,
   .layout-region--node-footer {
+    grid-column: 1;
     margin-inline: auto;
     width: min(832px, 100%);
   }
 
   /* Push sidebar down to horizontal align with form section. */
   .layout-region--node-secondary {
+    grid-row: span 2;
     margin-block-start: var(--space-l);
   }
 }