diff --git a/plugins/chat/assets/stylesheets/common/chat-drawer.scss b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
index 7ea7fbada75..ee9587d52cc 100644
--- a/plugins/chat/assets/stylesheets/common/chat-drawer.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
@@ -56,7 +56,6 @@ html.rtl {
   }
 
   box-sizing: border-box;
-  max-height: 90vh;
   padding-bottom: var(--composer-height, 0);
   transition: all 100ms ease-in;
   transition-property: bottom, padding-bottom;
@@ -67,7 +66,7 @@ html.rtl {
   width: 400px;
   min-width: 250px !important; // important to override inline styles
   max-width: calc(100% - var(--composer-right));
-  max-height: 85vh;
+  max-height: calc(100vh - var(--header-offset) - 15px);
   min-height: 300px !important; // important to override inline styles
 
   .chat-drawer-container {