diff --git a/package.json b/package.json
index dde5928841..a374e8d672 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "MIT",
   "dependencies": {
-    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#7d7f8077f5faf201ba9a1133c0a50b19c32bfa1c",
+    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#eee4f5060fb66327a44ff4f9ecba81d927481e79",
     "lodash": "^3.10.0",
     "moment": "^2.11.1"
   },
diff --git a/src/home-assistant.js b/src/home-assistant.js
index 26a864a681..a1bcfdb257 100644
--- a/src/home-assistant.js
+++ b/src/home-assistant.js
@@ -89,7 +89,7 @@ export default new Polymer({
       return;
     }
 
-    navigator.serviceWorker.register('./service_worker.js').catch(err => {
+    navigator.serviceWorker.register('/service_worker.js').catch(err => {
       if (__DEV__) {
         /* eslint-disable no-console */
         console.warn('Unable to register service worker', err);
diff --git a/src/layouts/partial-cards.js b/src/layouts/partial-cards.js
index 68b4ea786d..7fef4890ef 100644
--- a/src/layouts/partial-cards.js
+++ b/src/layouts/partial-cards.js
@@ -150,7 +150,10 @@ export default new Polymer({
   },
 
   viewSelected(ev) {
-    const section = ev.detail.item.getAttribute('data-entity') || null;
-    this.async(() => viewActions.selectView(section), 0);
+    const view = ev.detail.item.getAttribute('data-entity') || null;
+    const current = this.currentView || null;
+    if (view !== current) {
+      this.async(() => viewActions.selectView(view), 0);
+    }
   },
 });