diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 5d07b54f8f..26dd5c5b3e 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -11,11 +11,9 @@ import createRowElement from "../common/create-row-element.js";
 import computeDomain from "../../../common/entity/compute_domain.js";
 import processConfigEntities from "../common/process-config-entities";
 import { HomeAssistant } from "../../../types.js";
+import { EntityConfig, EntityRow } from "../entity-rows/types.js";
 
-interface EntityConfig {
-  name?: string;
-  icon?: string;
-  entity: string;
+interface ConfigEntity extends EntityConfig {
   type?: string;
   secondary_info: "entity-id" | "last-changed";
   action_name?: string;
@@ -27,23 +25,22 @@ interface EntityConfig {
 interface Config extends LovelaceConfig {
   show_header_toggle?: boolean;
   title?: string;
-  entities: EntityConfig[];
+  entities: ConfigEntity[];
 }
 
 class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
   implements LovelaceCard {
   protected _hass?: HomeAssistant;
   protected config?: Config;
-  protected configEntities?: EntityConfig[];
+  protected configEntities?: ConfigEntity[];
 
   set hass(hass) {
     this._hass = hass;
-    if (this.shadowRoot && this.shadowRoot.querySelector("ha-card")) {
+    if (this.shadowRoot) {
       this.shadowRoot
-        .querySelector("ha-card")!
-        .querySelectorAll("#states > div > *")
+        .querySelectorAll("#states > *")
         .forEach((element: any) => {
-          element.hass = hass;
+          (element as EntityRow).hass = hass;
         });
     }
   }
@@ -133,10 +130,10 @@ class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
         #states {
           margin: -4px 0;
         }
-        #states > div {
+        #states > * {
           margin: 4px 0;
         }
-        #states > div > * {
+        #states > * {
           overflow: hidden;
         }
         .header {
@@ -168,19 +165,19 @@ class HuiEntitiesCard extends HassLocalizeLitMixin(LitElement)
       !DOMAINS_HIDE_MORE_INFO.includes(computeDomain(entityConf.entity))
     ) {
       element.classList.add("state-card-dialog");
-      element.onclick = this.handleClick;
+      // element.onclick = this.handleClick;
+      element.addEventListener("click", this.handleClick);
     }
 
     return html`
-      <div>
       ${element}
-      </div>
     `;
   }
 
   private handleClick(ev: MouseEvent) {
-    const config = (ev.currentTarget as any).entityConf as EntityConfig;
+    const config = (ev.currentTarget as any).entityConf as ConfigEntity;
     const entityId = config.entity;
+    console.log("clicked");
 
     fireEvent(this, "hass-more-info", { entityId });
   }
diff --git a/src/panels/lovelace/entity-rows/types.ts b/src/panels/lovelace/entity-rows/types.ts
new file mode 100644
index 0000000000..249dfdbdbc
--- /dev/null
+++ b/src/panels/lovelace/entity-rows/types.ts
@@ -0,0 +1,12 @@
+import { HomeAssistant } from "../../../types";
+
+export interface EntityConfig {
+  entity: string;
+  name: string;
+  icon: string;
+}
+
+export interface EntityRow {
+  hass: HomeAssistant;
+  config: EntityConfig;
+}
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index 036fe62fbf..223edab055 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -1,5 +1,3 @@
-import { HomeAssistant } from "../../types";
-
 export interface LovelaceConfig {
   type: string;
 }
@@ -9,14 +7,3 @@ export interface LovelaceCard extends HTMLElement {
   getCardSize(): number;
   setConfig(config: LovelaceConfig): void;
 }
-
-export interface EntityConfig {
-  entity: string;
-  name: string;
-  icon: string;
-}
-
-export interface EntityRow {
-  hass: HomeAssistant;
-  config: EntityConfig;
-}