diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 8fb7137e9a..e617f62ed4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -73,6 +73,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
             appState.setSectionState("showSearchResults", false);
             appState.setGlobalState("stickyNavigation", false);
             appState.setGlobalState("showTray", false);
+			appState.setMenuState("currentNode", null);
 
             if (appState.getGlobalState("isTablet") === true) {
                 appState.setGlobalState("showNavigation", false);
@@ -660,10 +661,10 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
 	     */
         hideDialog: function (showMenu) {
 
-            setMode("default");
-
-            if(showMenu){
+            if (showMenu) {
                 this.showMenu(undefined, { skipDefault: true, node: appState.getMenuState("currentNode") });
+            } else {
+                setMode("default");
             }
         },
         /**