diff --git a/scss/box-view.scss b/scss/box-view.scss
index 7dc7cba..7fb508e 100644
--- a/scss/box-view.scss
+++ b/scss/box-view.scss
@@ -19,6 +19,9 @@
 
 .has-full-page-chat .chat-replying-indicator-container {
   margin-bottom: var(--d-border-radius-large);
+  @include breakpoint(medium) {
+    margin-bottom: 0;
+  }
 }
 
 .experimental-screen {
diff --git a/scss/main.scss b/scss/main.scss
index 212b08e..e6a9b8a 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -20,8 +20,8 @@ body.has-full-page-chat:not(.has-sidebar-page) {
   }
   #main-outlet-wrapper {
     gap: var(--main-grid-gap);
-    @include breakpoint(mobile-extra-large) {
-      grid-column-gap: 0;
+    @include breakpoint("medium") {
+      gap: 0;
     }
     .full-page-chat.full-page-chat-sidebar-enabled,
     .c-navbar-container {
@@ -39,7 +39,9 @@ body.has-sidebar-page #main-outlet-wrapper {
 }
 
 body:not(.has-sidebar-page) #main-outlet-wrapper {
-  grid-template-columns: 0px 1fr 0px;
+  @include breakpoint("medium", $rule: min-width) {
+    grid-template-columns: 0px 1fr 0px;
+  }
 }
 
 body:not(.has-full-page-chat) {