diff --git a/app/assets/stylesheets/common/base/sidebar.scss b/app/assets/stylesheets/common/base/sidebar.scss
index 84162701e43..c4dd9c8cc74 100644
--- a/app/assets/stylesheets/common/base/sidebar.scss
+++ b/app/assets/stylesheets/common/base/sidebar.scss
@@ -31,6 +31,7 @@
 
   .footer-nav-ipad & {
     top: calc(var(--header-offset) + var(--footer-nav-height));
+    height: calc(100vh - var(--header-offset, 0) - var(--footer-nav-height, 0));
   }
   height: calc(100vh - var(--header-offset, 0));
   align-self: start;
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-composer.scss b/plugins/chat/assets/stylesheets/desktop/chat-composer.scss
index 9ab578cbf85..3095d1851ad 100644
--- a/plugins/chat/assets/stylesheets/desktop/chat-composer.scss
+++ b/plugins/chat/assets/stylesheets/desktop/chat-composer.scss
@@ -2,4 +2,7 @@
   .chat-composer {
     margin: 0.25rem 10px 0 10px;
   }
+  html.keyboard-visible .footer-nav-ipad & {
+    margin: 0.25rem 10px 1rem 10px;
+  }
 }