diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1adb67887c..e5fab4dde7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -685,7 +685,7 @@ module.exports = React.createClass({
             onLoginClick: (ev) => {
                 dis.dispatch({action: 'start_login'});
                 close();
-            },            
+            },
         }).close;
     },
 
@@ -991,6 +991,11 @@ module.exports = React.createClass({
             dis.dispatch({
                 action: 'view_home_page',
             });
+        } else if (screen == 'start') {
+            this.showScreen('home');
+            dis.dispatch({
+                action: 'view_set_mxid',
+            });
         } else if (screen == 'directory') {
             dis.dispatch({
                 action: 'view_room_directory',