diff --git a/hassio/addon-store/hassio-addon-repository.html b/hassio/addon-store/hassio-addon-repository.html
index a89cda9c52..36b9c87c3c 100644
--- a/hassio/addon-store/hassio-addon-repository.html
+++ b/hassio/addon-store/hassio-addon-repository.html
@@ -45,7 +45,7 @@
 </dom-module>
 
 <script>
-class HassioAddonRepository extends window.hassMixins.EventsMixin(Polymer.Element) {
+class HassioAddonRepository extends window.hassMixins.NavigateMixin(Polymer.Element) {
   static get is() { return 'hassio-addon-repository'; }
 
   static get properties() {
@@ -74,8 +74,7 @@ class HassioAddonRepository extends window.hassMixins.EventsMixin(Polymer.Elemen
   }
 
   addonTapped(ev) {
-    history.pushState(null, null, '/hassio/addon/' + ev.model.addon.slug);
-    this.fire('location-changed');
+    this.navigate(`/hassio/addon/${ev.model.addon.slug}`);
   }
 }
 
diff --git a/hassio/dashboard/hassio-addons.html b/hassio/dashboard/hassio-addons.html
index 2f89795dcd..51ae65ceb5 100644
--- a/hassio/dashboard/hassio-addons.html
+++ b/hassio/dashboard/hassio-addons.html
@@ -39,7 +39,7 @@
 </dom-module>
 
 <script>
-class HassioAddons extends window.hassMixins.EventsMixin(Polymer.Element) {
+class HassioAddons extends window.hassMixins.NavigateMixin(Polymer.Element) {
   static get is() { return 'hassio-addons'; }
 
   static get properties() {
@@ -68,14 +68,12 @@ class HassioAddons extends window.hassMixins.EventsMixin(Polymer.Element) {
   }
 
   addonTapped(ev) {
-    history.pushState(null, null, '/hassio/addon/' + ev.model.addon.slug);
-    this.fire('location-changed');
+    this.navigate('/hassio/addon/' + ev.model.addon.slug);
     ev.target.blur();
   }
 
   openStore(ev) {
-    history.pushState(null, null, '/hassio/store');
-    this.fire('location-changed');
+    this.navigate('/hassio/store');
     ev.target.blur();
   }
 }
diff --git a/panels/config/automation/ha-automation-picker.html b/panels/config/automation/ha-automation-picker.html
index 16c1a89330..e635efb9bc 100644
--- a/panels/config/automation/ha-automation-picker.html
+++ b/panels/config/automation/ha-automation-picker.html
@@ -99,7 +99,7 @@
  * @appliesMixin window.hassMixins.EventsMixin
  */
 class HaAutomationPicker extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
+  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
   static get is() { return 'ha-automation-picker'; }
 
   static get properties() {
@@ -128,13 +128,11 @@ class HaAutomationPicker extends
   }
 
   automationTapped(ev) {
-    history.pushState(null, null, '/config/automation/edit/' + this.automations[ev.model.index].attributes.id);
-    this.fire('location-changed');
+    this.navigate('/config/automation/edit/' + this.automations[ev.model.index].attributes.id);
   }
 
   addAutomation() {
-    history.pushState(null, null, '/config/automation/new');
-    this.fire('location-changed');
+    this.navigate('/config/automation/new');
   }
 
   computeName(automation) {
diff --git a/panels/config/dashboard/ha-config-navigation.html b/panels/config/dashboard/ha-config-navigation.html
index 07d4ccaccc..921960c163 100644
--- a/panels/config/dashboard/ha-config-navigation.html
+++ b/panels/config/dashboard/ha-config-navigation.html
@@ -43,7 +43,7 @@
    * @appliesMixin window.hassMixins.EventsMixin
    */
   class HaConfigNavigation extends
-    window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
+    window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
     static get is() { return 'ha-config-navigation'; }
 
     static get properties() {
@@ -78,8 +78,7 @@
     }
 
     _navigate(ev) {
-      history.pushState(null, null, '/config/' + ev.model.item);
-      this.fire('location-changed');
+      this.navigate('/config/' + ev.model.item);
     }
   }
 
diff --git a/panels/config/script/ha-script-picker.html b/panels/config/script/ha-script-picker.html
index 5c6b45f5cc..1be02521d2 100644
--- a/panels/config/script/ha-script-picker.html
+++ b/panels/config/script/ha-script-picker.html
@@ -95,7 +95,7 @@
  * @appliesMixin window.hassMixins.EventsMixin
  */
 class HaScriptPicker extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
+  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
   static get is() { return 'ha-script-picker'; }
 
   static get properties() {
@@ -124,13 +124,11 @@ class HaScriptPicker extends
   }
 
   scriptTapped(ev) {
-    history.pushState(null, null, '/config/script/edit/' + this.scripts[ev.model.index].entity_id);
-    this.fire('location-changed');
+    this.navigate('/config/script/edit/' + this.scripts[ev.model.index].entity_id);
   }
 
   addScript() {
-    history.pushState(null, null, '/config/script/new');
-    this.fire('location-changed');
+    this.navigate('/config/script/new');
   }
 
   computeName(script) {
diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html
index cbaf046959..57946ec062 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.html
@@ -160,7 +160,7 @@
  * @appliesMixin window.hassMixins.EventsMixin
  */
 class HaSidebar extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
+  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
   static get is() { return 'ha-sidebar'; }
 
   static get properties() {
@@ -259,8 +259,7 @@ class HaSidebar extends
     if (path === document.location.pathname) {
       return;
     }
-    history.pushState(null, null, path);
-    this.fire('location-changed');
+    this.navigate(path);
   }
 
   handleLogOut() {