diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html
index 12d281bc009..51bbcc6fb6e 100755
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html
@@ -16,7 +16,7 @@
       <paper-toggle-button class='self-center'
         checked="[[toggleChecked]]"
         on-change="toggleChanged"
-        on-click="toggleClicked">
+        on-tap="toggleTapped">
       </paper-toggle-button>
     </div>
 
@@ -47,6 +47,10 @@
       this.forceStateChange();
     },
 
+    toggleTapped: function(ev) {
+      ev.stopPropagation();
+    },
+
     toggleChanged: function(ev) {
       var newVal = ev.target.checked;
 
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
index f542fdcdd59..65e1a9e4818 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
@@ -37,10 +37,10 @@
     },
 
     listeners: {
-      'click': 'cardClicked',
+      'tap': 'cardTapped',
     },
 
-    cardClicked: function() {
+    cardTapped: function() {
       uiActions.showMoreInfoDialog(this.stateObj.entityId);
     },
   });