diff --git a/src/components/ha-form/ha-form-grid.ts b/src/components/ha-form/ha-form-grid.ts
index 82baf2b3b4..c9fccfe4f3 100644
--- a/src/components/ha-form/ha-form-grid.ts
+++ b/src/components/ha-form/ha-form-grid.ts
@@ -82,7 +82,6 @@ export class HaFormGrid extends LitElement implements HaFormElement {
       }
       :host > ha-form {
         display: block;
-        margin-bottom: 24px;
       }
     `;
   }
diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts
index a16bd3799e..c90c4d0c12 100644
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -155,14 +155,10 @@ export class HaForm extends LitElement implements HaFormElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      .root {
-        margin-bottom: -24px;
-        overflow: clip visible;
-      }
       .root > * {
         display: block;
       }
-      .root > *:not([own-margin]) {
+      .root > *:not([own-margin]):not(:last-child) {
         margin-bottom: 24px;
       }
       ha-alert[own-margin] {