diff --git a/src/cards/ha-domain-card.html b/src/cards/ha-domain-card.html
index 40f16b2629..cf0b887fb2 100644
--- a/src/cards/ha-domain-card.html
+++ b/src/cards/ha-domain-card.html
@@ -17,7 +17,7 @@
     <ha-card header='[[computeDomainTitle(domain)]]'>
       <div class='states'>
         <template is='dom-repeat' items="[[states]]">
-          <div class='state' on-tap='entityTapped'>
+          <div class='state' on-click='entityTapped'>
             <state-card-content class="state-card" state-obj="[[item]]"></state-card-content>
           </div>
         </template>
diff --git a/src/components/entity/ha-state-label-badge.js b/src/components/entity/ha-state-label-badge.js
index 4d143c0f85..805fd01ffd 100644
--- a/src/components/entity/ha-state-label-badge.js
+++ b/src/components/entity/ha-state-label-badge.js
@@ -19,7 +19,7 @@ export default new Polymer({
   },
 
   listeners: {
-    'tap': 'badgeTap',
+    'click': 'badgeTap',
   },
 
   badgeTap(ev) {