diff --git a/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss b/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss
index 5966430b58b..f92d80c9b09 100644
--- a/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-height-mixin.scss
@@ -20,6 +20,8 @@
 
   // PWA/HUB without keyboard
   html.footer-nav-visible:not(.keyboard-visible) & {
-    height: calc($base-height - var(--footer-nav-height, 0px));
+    height: calc(
+      $base-height - var(--composer-height, 0px) - var(--footer-nav-height, 0px)
+    );
   }
 }