diff --git a/files/style/be.bastelstu.chat.scss b/files/style/be.bastelstu.chat.scss
index 52083c5..331cc93 100644
--- a/files/style/be.bastelstu.chat.scss
+++ b/files/style/be.bastelstu.chat.scss
@@ -78,6 +78,10 @@ #tpl_chat_log {
 				columns: 1;
 
 				margin-bottom: 0;
+
+				> .box {
+					border-bottom: none;
+				}
 			}
 		}
 	}
@@ -99,6 +103,7 @@ #tpl_chat_log {
 			}
 
 			> .boxContainer {
+				overflow: auto;
 				flex: 1 1 auto;
 
 				> .box {
@@ -106,15 +111,27 @@ #tpl_chat_log {
 						flex: 2 0 0px;
 						min-height: 15rem;
 
+						html.fullscreen & {
+							flex: 1 1 content;
+						}
+
 						> .boxContent {
 							flex-basis: 6rem;
 						}
 					}
 
 					&[data-box-identifier='be.bastelstu.chat.roomListSidebar'] {
-						flex: 1 1 0px;
+						flex: 1 1 12rem;
 						min-height: 12rem;
 
+						html.fullscreen & {
+							flex: 1 1 content;
+						}
+
+						@media screen and (max-height: 440px) {
+							min-height: 120px;
+						}
+
 						.badge {
 							float: right;
 							padding-left: 7px;