diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 9305dbca3f..ad3a6ecd87 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -548,7 +548,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
     /**
      * Pages of "no return" (Go back).
      */
-    var startPages = ['home', 'login'];
+    var startPages = ['home', 'login', 'selectserver'];
 
     function canGoBack() {
         var curr = current();
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 69c996877f..b726aaf872 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -313,7 +313,8 @@ define([
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "auth/selectserver"
+        controller: "auth/selectserver",
+        type: "selectserver"
     });
     defineRoute({
         path: "/serveractivity.html",