diff --git a/src/ui/web/css/layout.css b/src/ui/web/css/layout.css
index 098be686..048888b0 100644
--- a/src/ui/web/css/layout.css
+++ b/src/ui/web/css/layout.css
@@ -50,6 +50,11 @@ body {
     min-height: 0;
     display: flex;
     flex-direction: column;
+    height: 100%;
+}
+
+.TimelinePanel ul {
+    flex: 1 0 0;
 }
 
 .RoomHeader {
diff --git a/src/ui/web/css/timeline.css b/src/ui/web/css/timeline.css
index 0b38857c..89d927f4 100644
--- a/src/ui/web/css/timeline.css
+++ b/src/ui/web/css/timeline.css
@@ -1,6 +1,5 @@
 
 .TimelinePanel ul {
-    flex: 1;
     overflow-y: auto;
     list-style: none;
     padding: 0;