diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index ab33f4e2d4..99a904cebb 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -50,11 +50,18 @@ limitations under the License.
 
 
 .mx_RoomTile_nameContainer {
-    display: inline-block;
+    display: flex;
+    align-items: center;
     width: 180px;
     vertical-align: middle;
 }
 
+.mx_RoomTile_labelContainer {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+}
+
 .mx_RoomTile_avatar {
     flex: 0;
     padding: 4px;
@@ -103,7 +110,7 @@ limitations under the License.
     flex: 1 5 auto;
     font-size: 14px;
     font-weight: 600;
-    padding: 6px;
+    padding: 0 6px;
     color: $roomtile-name-color;
     white-space: nowrap;
     overflow-x: hidden;
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index ae83c70fcd..bce4d15f16 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -354,8 +354,10 @@ module.exports = React.createClass({
                 </div>
             </div>
             <div className="mx_RoomTile_nameContainer">
-                { label }
-                { subtextLabel }
+                <div className="mx_RoomTile_labelContainer">
+                    { label }
+                    { subtextLabel }
+                </div>
                 { contextMenuButton }
                 { badge }
             </div>