diff --git a/src/panels/lovelace/cards/hui-horizontal-stack-card.js b/src/panels/lovelace/cards/hui-horizontal-stack-card.js
index 5140b9792a..d57766ce92 100644
--- a/src/panels/lovelace/cards/hui-horizontal-stack-card.js
+++ b/src/panels/lovelace/cards/hui-horizontal-stack-card.js
@@ -10,13 +10,17 @@ class HuiHorizontalStackCard extends PolymerElement {
       <style>
         #root {
           display: flex;
-          margin-left: -4px;
-          margin-right: -4px;
         }
         #root > * {
           flex: 1 1 0;
           margin: 0 4px;
         }
+        #root > *:first-child {
+          margin-left: 0;
+        }
+        #root > *:last-child {
+          margin-right: 0;
+        }
       </style>
       <div id="root"></div>
     `;
diff --git a/src/panels/lovelace/cards/hui-vertical-stack-card.js b/src/panels/lovelace/cards/hui-vertical-stack-card.js
index 600a4a2ff3..5f14614302 100644
--- a/src/panels/lovelace/cards/hui-vertical-stack-card.js
+++ b/src/panels/lovelace/cards/hui-vertical-stack-card.js
@@ -11,12 +11,16 @@ class HuiVerticalStackCard extends PolymerElement {
         #root {
           display: flex;
           flex-direction: column;
-          margin-top: -4px;
-          margin-bottom: -8px;
         }
         #root > * {
           margin: 4px 0 8px 0;
         }
+        #root > *:first-child {
+          margin-top: 0;
+        }
+        #root > *:last-child {
+          margin-bottom: 0;
+        }
       </style>
       <div id="root"></div>
     `;