2 files changed, 3 insertions, 3 deletions
diff --git a/install/ui/src/freeipa/navigation/Router.js b/install/ui/src/freeipa/navigation/Router.js
index a65c60fd3..5523993f4 100644
--- a/install/ui/src/freeipa/navigation/Router.js
+++ b/install/ui/src/freeipa/navigation/Router.js
@@ -66,7 +66,6 @@ define(['dojo/_base/declare',
          */
         ignore_next: false,
 
-
         /**
          * Register a route-handler pair to a dojo.router
          * Handler will be run in context of this object
@@ -111,6 +110,7 @@ define(['dojo/_base/declare',
          * @param {boolean} Whether to suppress following hash change handler
          */
         update_hash: function(hash, ignore_change) {
+            if (window.location.hash === "#" + hash) return;
             this.ignore_next = !!ignore_change;
             router.go(hash);
         },
diff --git a/install/ui/src/freeipa/navigation/routing.js b/install/ui/src/freeipa/navigation/routing.js
index 6e18b0228..89a323dd5 100644
--- a/install/ui/src/freeipa/navigation/routing.js
+++ b/install/ui/src/freeipa/navigation/routing.js
@@ -166,7 +166,7 @@ var routing = {
      */
     navigate_to_facet: function(facet, options) {
         var hash = this.create_hash(facet, options);
-        return this.router.navigate_to_hash(hash);
+        return this.router.navigate_to_hash(hash, facet);
     },
 
     update_hash: function(facet, options) {
@@ -494,7 +494,7 @@ routing.init = function(router) {
     var entity_n = new routing.EntityNavigator();
     this.add_hash_creator(generic_hc);
     this.add_hash_creator(entity_hc);
-    this.add_route(this.routes, generic_rh);
+    this.add_route(this.page_routes, generic_rh);
     this.add_route(this.entity_routes, entity_rh);
     this.add_navigator(generic_n);
     this.add_navigator(entity_n);