diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index f2f4e216e3..17aa245232 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -148,9 +148,9 @@ class HuiEntitiesCard extends hassLocalizeLitMixin(LitElement)
           margin: -4px 0;
         }
         #states > * {
-          margin: 4px 0;
+          margin: 8px 0;
         }
-        #states > * {
+        #states > div > * {
           overflow: hidden;
         }
         .header {
@@ -186,7 +186,7 @@ class HuiEntitiesCard extends hassLocalizeLitMixin(LitElement)
       element.addEventListener("click", () => this._handleClick(entityConf));
     }
 
-    return element;
+    return html`<div>${element}</div>`;
   }
 
   private _handleClick(entityConf: ConfigEntity): void {