diff --git a/src/cards/ha-domain-card.html b/src/cards/ha-domain-card.html
index 70c6f2d198..40f16b2629 100644
--- a/src/cards/ha-domain-card.html
+++ b/src/cards/ha-domain-card.html
@@ -10,8 +10,6 @@
     }
     .state {
       padding: 8px 16px;
-    }
-    state-card-content {
       cursor: pointer;
     }
   </style>
@@ -19,8 +17,8 @@
     <ha-card header='[[computeDomainTitle(domain)]]'>
       <div class='states'>
         <template is='dom-repeat' items="[[states]]">
-          <div class='state'>
-            <state-card-content class="state-card" state-obj="[[item]]" on-tap='entityTapped'></state-card-content>
+          <div class='state' on-tap='entityTapped'>
+            <state-card-content class="state-card" state-obj="[[item]]"></state-card-content>
           </div>
         </template>
       </div>
diff --git a/src/cards/ha-domain-card.js b/src/cards/ha-domain-card.js
index 58af9ff7d9..84fc093a23 100644
--- a/src/cards/ha-domain-card.js
+++ b/src/cards/ha-domain-card.js
@@ -22,7 +22,7 @@ export default new Polymer({
 
   entityTapped(ev) {
     ev.stopPropagation();
-    const entityId = ev.currentTarget.stateObj.entityId;
+    const entityId = ev.model.item.entityId;
     this.async(() => moreInfoActions.selectEntity(entityId), 1);
   },
 });