diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index e510de08a4..3916261dda 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -75,6 +75,12 @@ module.exports = React.createClass({
         this.dispatcherRef = dis.register(this.onAction);
         // Initialise the stickyHeaders when the component is created
         this._updateStickyHeaders(true);
+
+        if (this.props.selectedRoom) {
+            constantTimeDispatcher.dispatch(
+                "RoomTile.select", this.props.selectedRoom, { selected: true }
+            );            
+        }
     },
 
     componentWillReceiveProps: function(nextProps) {
@@ -155,8 +161,6 @@ module.exports = React.createClass({
         }
         // cancel any pending calls to the rate_limited_funcs
         this._delayedRefreshRoomList.cancelPendingCall();
-        document.removeEventListener('keydown', this._onKeyDown);
-
     },
 
     onRoom: function(room) {