diff --git a/admin/client/src/boot/index.js b/admin/client/src/boot/index.js
index 260d7b409..0948bd0f7 100644
--- a/admin/client/src/boot/index.js
+++ b/admin/client/src/boot/index.js
@@ -95,11 +95,10 @@ function appBoot() {
         return;
       }
 
-      // Load the panel then call the next route.
+      // Load the panel and stop processing routes.
       $('.cms-container')
         .entwine('ss')
-        .handleStateChange(null, ctx.state)
-        .done(next);
+        .handleStateChange(null, ctx.state);
     });
   });
 
diff --git a/admin/client/src/legacy/LeftAndMain.js b/admin/client/src/legacy/LeftAndMain.js
index c3c5f1d18..71cfc3a6a 100644
--- a/admin/client/src/legacy/LeftAndMain.js
+++ b/admin/client/src/legacy/LeftAndMain.js
@@ -529,8 +529,8 @@ $.entwine('ss', function($) {
         this.setPauseState(true);
 
         // Restore best last state
-        if (lastState !== null) {
-          window.ss.router.show(lastState.url);
+        if (lastState && lastState.path) {
+          window.ss.router.show(lastState.path);
         } else {
           window.ss.router.back();
         }