diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 22163d9aa9..991324980e 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -302,9 +302,11 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
         --ha-card-border-radius,
         var(--ha-border-radius-lg)
       );
-      margin-bottom: 16px;
       overflow: hidden;
     }
+    .header:not(:has(> hui-buttons-header-footer)) {
+      margin-bottom: var(--ha-space-4);
+    }
 
     .footer {
       border-bottom-left-radius: var(