diff --git a/resources/chatbox.scss b/resources/chatbox.scss
index e4b3264..3f1a47b 100644
--- a/resources/chatbox.scss
+++ b/resources/chatbox.scss
@@ -78,7 +78,7 @@
     #chat-container {
         display: flex;
         width: 100%;
-        height: calc(100vh - 3em);
+        height: calc(100vh - $navbar_height);
         border: 1px solid #ccc;
         /*border-radius: 0 4px 0 0;*/
         border-bottom: 0;
@@ -220,5 +220,6 @@
 @media (max-width: 799px) {
     #chat-area {
         height: calc(100vh - $navbar_height_mobile);
+        max-height: -webkit-fill-available;
     }
 }
diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html
index 01929cd..a03d481 100644
--- a/templates/chat/chat_css.html
+++ b/templates/chat/chat_css.html
@@ -195,9 +195,6 @@
       #chat-input-container {
         padding-left: 3%;
       }
-      #chat-area {
-        padding-bottom: 1.5em;
-      }
       .back-button {
         display: none;
       }