diff --git a/css/molecules/RoomTile.css b/css/molecules/RoomTile.css
index 7b0aa8f830..babeedaf27 100644
--- a/css/molecules/RoomTile.css
+++ b/css/molecules/RoomTile.css
@@ -1,6 +1,5 @@
 .mx_RoomTile {
     height: 20px;
-    width: 250px;
     background-color: #ddd;
     margin-top: 1px;
     margin-bottom: 1px;
diff --git a/css/organisms/RoomList.css b/css/organisms/RoomList.css
index b3a739be85..b92b57fcd5 100644
--- a/css/organisms/RoomList.css
+++ b/css/organisms/RoomList.css
@@ -1,5 +1,4 @@
 .mx_RoomList {
-    display: table-row;
 }
 
 .mx_RoomList ul {
diff --git a/css/organisms/RoomView.css b/css/organisms/RoomView.css
index 35f935b01a..5ebf1083c1 100644
--- a/css/organisms/RoomView.css
+++ b/css/organisms/RoomView.css
@@ -1,7 +1,7 @@
 .mx_RoomView {
     display: table-cell;
     padding-left: 5px;
-    width: 100%;
+    word-wrap: break-word;
 }
 
 .mx_RoomView ul {
diff --git a/css/pages/MatrixChat.css b/css/pages/MatrixChat.css
index da89f9d31b..51ec0f2ad0 100644
--- a/css/pages/MatrixChat.css
+++ b/css/pages/MatrixChat.css
@@ -1,3 +1,10 @@
+.mx_MatrixChat {
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+}
+
 .mx_MatrixChat_leftPanel {
     display: table-cell;
+    width: 250px;
 }
diff --git a/src/pages/MatrixChat.js b/src/pages/MatrixChat.js
index ca9cab78dd..cc29e277d8 100644
--- a/src/pages/MatrixChat.js
+++ b/src/pages/MatrixChat.js
@@ -68,7 +68,7 @@ module.exports = React.createClass({
     render: function() {
         if (this.state.logged_in && this.state.ready) {
             return (
-                <div>
+                <div className="mx_MatrixChat">
                     <div className="mx_MatrixChat_leftPanel">
                         <MatrixToolbar />
                         <RoomList selectedRoom={this.state.currentRoom} />