diff --git a/css/organisms/RoomView.css b/css/organisms/RoomView.css
index 5ebf1083c1..d9345f75ec 100644
--- a/css/organisms/RoomView.css
+++ b/css/organisms/RoomView.css
@@ -6,4 +6,6 @@
 
 .mx_RoomView ul {
     padding: 0px;
+    height: 100%;
+    overflow-y: scroll;
 }
diff --git a/css/pages/MatrixChat.css b/css/pages/MatrixChat.css
index 51ec0f2ad0..2d79495bff 100644
--- a/css/pages/MatrixChat.css
+++ b/css/pages/MatrixChat.css
@@ -2,6 +2,7 @@
     display: table;
     table-layout: fixed;
     width: 100%;
+    height: 100%;
 }
 
 .mx_MatrixChat_leftPanel {
diff --git a/example/index.html b/example/index.html
index c6de4d5f2d..bdc7ce7e01 100644
--- a/example/index.html
+++ b/example/index.html
@@ -1,11 +1,11 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" style="height: 100%; overflow: hidden">
   <head>
     <meta charset="utf-8">
     <title>Matrix Flux</title>
   </head>
-  <body>
-    <section id="matrixchat"></section>
+  <body style="height: 100%; ">
+    <section id="matrixchat" style="height: 100%; "></section>
     <script src="bundle.js"></script>
     <link rel="stylesheet" href="bundle.css">
   </body>
