diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js
index 252bbdfa22..6334b859e2 100644
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -88,6 +88,7 @@ define(
                 }
 
                 if (isDirty() && !confirm(CONFIRM_MSG)) {
+                    $scope.treeModel.selectedObject = $scope.navigatedObject;
                     navigationService.setNavigation($scope.navigatedObject);
                 } else {
                     if ($scope.navigatedObject && $scope.navigatedObject.hasCapability("editor")){
@@ -100,17 +101,6 @@ define(
                 }
             }
 
-            function setSelectedObject(domainObject) {
-                if (domainObject !== $scope.navigatedObject && isDirty() && !confirm(CONFIRM_MSG)) {
-                        $scope.treeModel.selectedObject = $scope.navigatedObject;
-                } else {
-                    if (domainObject !== $scope.navigatedObject && $scope.navigatedObject.hasCapability('editor')){
-                        $scope.navigatedObject.getCapability('action').perform('cancel');
-                    }
-                    setNavigation(domainObject);
-                }
-            }
-
             function navigateTo(domainObject) {
 
                 // Check if an object has been navigated-to already...
@@ -188,7 +178,7 @@ define(
             navigationService.addListener(setNavigation);
 
             // Also listen for changes which come from the tree
-            $scope.$watch("treeModel.selectedObject", setSelectedObject);
+            $scope.$watch("treeModel.selectedObject", setNavigation);
             
             // Clean up when the scope is destroyed
             $scope.$on("$destroy", function () {