1 files changed, 7 insertions, 2 deletions
diff --git a/app/containers/SelectLocationPage.js b/app/containers/SelectLocationPage.js
index a817d0d9cb..3d89f69ba8 100644
--- a/app/containers/SelectLocationPage.js
+++ b/app/containers/SelectLocationPage.js
@@ -11,9 +11,14 @@ const mapDispatchToProps = (dispatch, props) => {
     onClose: () => props.router.push('/connect'),
     onSelect: (preferredServer) => {
       const server = backend.serverInfo(preferredServer);
-      settings.updateSettings({ preferredServer });
-      backend.connect(server.address);
+
       props.router.push('/connect');
+      
+      // add delay to let the map load
+      setTimeout(() => {
+        settings.updateSettings({ preferredServer });
+        backend.connect(server.address);
+      }, 600);
     }
   };
 };