diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index 89bdd86ba9..0556297fd4 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -20,7 +20,8 @@
  at runtime from the About dialog for additional information.
 -->
 
-<div class="abs holder-all browse-mode" ng-controller="BrowseController">
+<div class="abs holder-all browse-mode" ng-controller="BrowseController"
+     mct-before-unload="beforeUnloadWarning()">
     <mct-include key="'topbar-browse'"></mct-include>
     <div class="abs holder holder-main browse-area s-browse-area browse-wrapper"
          ng-controller="PaneController as modelPaneTree"
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js
index 42796e2c30..fa076ac8a4 100644
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -34,7 +34,8 @@ define(
         "use strict";
 
         var ROOT_ID = "ROOT",
-            DEFAULT_PATH = "mine";
+            DEFAULT_PATH = "mine",
+            CONFIRM_MSG = "Unsaved changes will be lost if you leave this page.";
 
         /**
          * The BrowseController is used to populate the initial scope in Browse
@@ -54,33 +55,50 @@ define(
             function updateRoute(domainObject) {
                 var priorRoute = $route.current,
                     // Act as if params HADN'T changed to avoid page reload
-                    unlisten;
+                    unlisten,
+                    navigateToObject = domainObject,
+                    mode = "browse";
 
                 unlisten = $scope.$on('$locationChangeSuccess', function () {
                     // Checks path to make sure /browse/ is at front
                     // if so, change $route.current
-                    if ($location.path().indexOf("/browse/") === 0) {
+                    //if ($location.path().indexOf("/browse/") === 0) {
                         $route.current = priorRoute;
-                    }
+                    //}
+                    setNavigation(domainObject);
                     unlisten();
                 });
                 // urlService.urlForLocation used to adjust current
                 // path to new, addressed, path based on
                 // domainObject
-                $location.path(urlService.urlForLocation("browse", domainObject));
+                if (domainObject && domainObject.hasCapability("editor")){
+                    //Set navigation path to edit mode
+                    mode = "edit";
+                    //Unwrap non-editable object for url calculation (needs
+                    // context capability
+                    navigateToObject = domainObject.getOriginalObject();
+                }
+                $location.path(urlService.urlForLocation(mode, navigateToObject));
 
             }
 
+            function setSelectedObject(domainObject) {
+               /* if (domainObject !== $scope.navigatedObject && isDirty()
+                && !confirm(CONFIRM_MSG)) {
+
+                        $scope.treeModel.selectedObject = $scope.navigatedObject;
+                } else {
+                    setNavigation(domainObject);
+                }*/
+                updateRoute(domainObject);
+            }
+
             // Callback for updating the in-scope reference to the object
             // that is currently navigated-to.
             function setNavigation(domainObject) {
-
-                var wrappedObject = domainObject;
-
-                $scope.navigatedObject = wrappedObject;
+                $scope.navigatedObject = domainObject;
                 $scope.treeModel.selectedObject = domainObject;
-                navigationService.setNavigation(domainObject);
-                updateRoute(domainObject);
+                //navigationService.setNavigation(domainObject);
             }
 
             function navigateTo(domainObject) {
@@ -150,25 +168,40 @@ define(
                 selectedObject: navigationService.getNavigation()
             };
 
-            $scope.beforeUnloadWarning = function() {
+            function isDirty(){
                 var editorCapability = $scope.navigatedObject &&
                         $scope.navigatedObject.getCapability("editor"),
                     hasChanges = editorCapability && editorCapability.dirty();
+                return hasChanges;
+            }
 
-                return hasChanges ?
+            function beforeNavigateWarning (){
+                if (isDirty()) {
+                    return false;
+                }
+                else {
+                    return true;
+                }
+            }
+
+            $scope.beforeUnloadWarning = function() {
+                return isDirty() ?
                     "Unsaved changes will be lost if you leave this page." :
                     undefined;
             }
 
             // Listen for changes in navigation state.
-            navigationService.addListener(setNavigation);
+            navigationService.addListener(updateRoute);
 
-            // Also listen for changes which come from the tree
-            $scope.$watch("treeModel.selectedObject", setNavigation);
+            // If the selected tree node changes, update the route. This
+            // ensures navigation is always in sync with browser location,
+            // and also allows unload event to be used for catching
+            // navigation as well as browse events.
+            $scope.$watch("treeModel.selectedObject", updateRoute);
             
             // Clean up when the scope is destroyed
             $scope.$on("$destroy", function () {
-                navigationService.removeListener(setNavigation);
+                navigationService.removeListener(updateRoute);
             });
         }
 
diff --git a/platform/commonUI/edit/bundle.json b/platform/commonUI/edit/bundle.json
index 8eb5703c02..ad37530413 100644
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -78,7 +78,7 @@
                 "implementation": "actions/CancelAction.js",
                 "name": "Cancel",
                 "description": "Discard changes made to these objects.",
-                "depends": ["$injector", "navigationService"]
+                "depends": ["$location", "urlService"]
             }
         ],
         "policies": [
diff --git a/platform/commonUI/edit/src/actions/CancelAction.js b/platform/commonUI/edit/src/actions/CancelAction.js
index 6b9cbf9c08..d2c3ecf90f 100644
--- a/platform/commonUI/edit/src/actions/CancelAction.js
+++ b/platform/commonUI/edit/src/actions/CancelAction.js
@@ -33,10 +33,10 @@ define(
          * @memberof platform/commonUI/edit
          * @implements {Action}
          */
-        function CancelAction($injector, navigationService, context) {
+        function CancelAction($location, urlService, context) {
             this.domainObject = context.domainObject;
-            this.navigationService = navigationService;
-            this.objectService = $injector.get('objectService');
+            this.$location = $location;
+            this.urlService = urlService;
         }
 
         /**
@@ -47,7 +47,8 @@ define(
          */
         CancelAction.prototype.perform = function () {
             var domainObject = this.domainObject,
-                self = this;
+                $location = this.$location,
+                urlService = this.urlService;
 
             // Look up the object's "editor.completion" capability;
             // this is introduced by EditableDomainObject which is
@@ -63,10 +64,13 @@ define(
                 return editor.cancel();
             }
 
-            //Discard current 'editable' object, and retrieve original
-            // un-edited object.
+            // Discard the current root view (which will be the editing
+            // UI, which will have been pushed atop the Browise UI.)
             function returnToBrowse() {
-                return self.navigationService.setNavigation(self.domainObject.getOriginalObject());
+                $location.path(urlService.urlForLocation(
+                    "browse",
+                    domainObject.getOriginalObject()
+                ));
             }
 
             return doCancel(getEditorCapability())
diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
index 5976b912cc..1f76c286cc 100644
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -76,7 +76,7 @@
             {
                 "key": "TreeNodeController",
                 "implementation": "controllers/TreeNodeController.js",
-                "depends": [ "$scope", "$timeout" ]
+                "depends": [ "$scope", "$timeout", "navigationService" ]
             },
             {
                 "key": "ActionGroupController",