diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index 3f9535b25a8a..28a4e7342769 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -76,10 +76,15 @@ button {
 #rocket-chat {
 	display: flex;
 
-	flex: 1;
+	flex: 1 1 auto;
 
 	align-items: stretch;
 
+	position: relative;
+
+	max-height: 100%;
+	height: 1px;
+
 	&.animated-hidden {
 		visibility: hidden;