diff --git a/framework/core/less/forum/DiscussionPage.less b/framework/core/less/forum/DiscussionPage.less
index 8166301e8..052d02479 100644
--- a/framework/core/less/forum/DiscussionPage.less
+++ b/framework/core/less/forum/DiscussionPage.less
@@ -23,17 +23,27 @@
   }
 }
 @media @tablet-up {
+  .DiscussionPage-discussion {
+    > .container {
+      display: grid;
+      grid-gap: 75px;
+      grid-template-columns: 1fr 150px;
+      grid-template-areas: 'stream nav';
+
+      &::before, &::after {
+        content: none;
+      }
+    }
+  }
+
   .DiscussionPage-nav {
-    float: right;
+    align-self: start;
     position: sticky;
+    grid-area: nav;
     top: var(--header-height);
     padding-top: 32px;
     z-index: 1;
 
-    &, > ul {
-      width: 150px;
-    }
-    
     > ul {
       > li {
         margin-bottom: 10px;
@@ -51,11 +61,9 @@
       }
     }
   }
-}
 
-@media @tablet-up {
   .DiscussionPage-stream {
-    margin-right: 225px;
+    grid-area: stream;
   }
 }
 
diff --git a/framework/core/less/forum/Post.less b/framework/core/less/forum/Post.less
index 691d8f687..6fe81e884 100644
--- a/framework/core/less/forum/Post.less
+++ b/framework/core/less/forum/Post.less
@@ -8,6 +8,7 @@
   position: relative;
   top: 0;
   border-radius: var(--border-radius);
+  .clearfix();
 
   &.editing {
     top: 5px;