diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 67570cbec0..59269d5770 100644
Binary files a/app/soapbox/features/ui/index.js and b/app/soapbox/features/ui/index.js differ
diff --git a/app/soapbox/reducers/accounts.js b/app/soapbox/reducers/accounts.js
index 847004da6b..b02ef763f1 100644
Binary files a/app/soapbox/reducers/accounts.js and b/app/soapbox/reducers/accounts.js differ
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 44a10e2f33..89268dfbee 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -176,9 +176,24 @@
   }
 }
 
-.column .chat-box {
-  max-height: calc(100vh - 125px);
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
+.ui--chatroom {
+  padding-bottom: 0;
+
+  .columns-area__panels__main .columns-area {
+    height: calc(100vh - 100px);
+    box-sizing: border-box;
+    overflow: hidden;
+
+    @media(max-width: 630px) {
+      height: calc(100vh - 50px);
+    }
+  }
+
+  .page {
+    .chat-box {
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+    }
+  }
 }