diff --git a/src/App.scss b/src/App.scss
index d319aa52..018d0313 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -140,7 +140,6 @@ nav {
 }
 
 #main-scroller {
-  margin-top: var(--navbar-height);
   grid-area: content;
   position: relative;
 }
@@ -206,13 +205,18 @@ nav {
     row-gap: var(--___columnMargin);
     align-content: start;
 
+    &:not(.-scrollable) {
+      margin-top: var(--navbar-height);
+    }
+
     &:hover {
       z-index: 2;
     }
 
     &.-full-height {
-      margin-top: 0;
       margin-bottom: 0;
+      padding-top: 0;
+      padding-bottom: 0;
     }
 
     &.-scrollable {
diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 90926904..9c98871d 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -1,9 +1,6 @@
 .chat-view {
   display: flex;
   height: 100%;
-  // Stick the form to the top/bottom of screen
-  margin-bottom: calc(var(--___columnMargin) / -2);
-  margin-top: calc(var(--___columnMargin) / -2);
 
   .chat-view-inner {
     height: auto;
@@ -23,8 +20,6 @@
     margin: 0 0 0 0;
     border-radius: 10px 10px 0 0;
     border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0;
-    margin-bottom: calc(var(--___columnMargin) * -1);
-    padding-bottom: var(--___columnMargin);
 
     &::after {
       border-radius: 0;