diff --git a/plugins/chat/assets/stylesheets/common/base-common.scss b/plugins/chat/assets/stylesheets/common/base-common.scss
index 3ec626ce2a3..464002d67be 100644
--- a/plugins/chat/assets/stylesheets/common/base-common.scss
+++ b/plugins/chat/assets/stylesheets/common/base-common.scss
@@ -617,6 +617,14 @@ html.has-full-page-chat {
       grid-template-rows: calc(
         var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px)
       );
+
+      .footer-nav-ipad & {
+        grid-template-rows: calc(
+          var(--chat-vh, 1vh) * 100 - var(--header-offset, 0px) -
+            var(--footer-nav-height, 0px)
+        );
+      }
+
       .sidebar-wrapper {
         // prevents sidebar from overflowing behind the virtual keyboard
         height: 100%;
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-composer.scss b/plugins/chat/assets/stylesheets/desktop/chat-composer.scss
deleted file mode 100644
index c6af087e68e..00000000000
--- a/plugins/chat/assets/stylesheets/desktop/chat-composer.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.chat-composer-container {
-  .chat-composer {
-    margin: 0.25rem 5px 0 5px;
-  }
-  html.keyboard-visible .footer-nav-ipad & {
-    margin: 0.25rem 10px 1rem 10px;
-  }
-}
diff --git a/plugins/chat/assets/stylesheets/desktop/index.scss b/plugins/chat/assets/stylesheets/desktop/index.scss
index e08babb76a8..03d6fb66517 100644
--- a/plugins/chat/assets/stylesheets/desktop/index.scss
+++ b/plugins/chat/assets/stylesheets/desktop/index.scss
@@ -1,7 +1,6 @@
 @import "base-desktop";
 @import "chat-channel-title";
 @import "chat-composer-uploads";
-@import "chat-composer";
 @import "chat-index-drawer";
 @import "chat-index-full-page";
 @import "chat-message-actions";