diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts
index 501e38cd7e..8fad6f7ca1 100644
--- a/src/panels/lovelace/cards/hui-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-stack-card.ts
@@ -98,10 +98,10 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
         display: block;
         padding: 24px 16px 16px;
       }
-      :host {
-        --ha-card-border-radius: inherit !important;
-        --ha-card-border-width: inherit !important;
-        --ha-card-box-shadow: inherit !important;
+      #root {
+        --ha-card-border-radius: var(--restore-card-border-radius, inherit);
+        --ha-card-border-width: var(--restore-card-border-width, inherit);
+        --ha-card-box-shadow: var(--restore-card-border-shadow, inherit);
       }
     `;
   }
diff --git a/src/panels/lovelace/views/hui-panel-view.ts b/src/panels/lovelace/views/hui-panel-view.ts
index c65238af5a..a47eac437f 100644
--- a/src/panels/lovelace/views/hui-panel-view.ts
+++ b/src/panels/lovelace/views/hui-panel-view.ts
@@ -108,6 +108,7 @@ export class PanelView extends LitElement implements LovelaceViewElement {
 
     const card: LovelaceCard = this.cards[0];
     card.isPanel = true;
+    card.toggleAttribute("no-border", true);
 
     if (this.isStrategy || !this.lovelace?.editMode) {
       card.editMode = false;
@@ -116,6 +117,7 @@ export class PanelView extends LitElement implements LovelaceViewElement {
     }
 
     const wrapper = document.createElement("hui-card-options");
+    wrapper.toggleAttribute("no-border", true);
     wrapper.hass = this.hass;
     wrapper.lovelace = this.lovelace;
     wrapper.path = [this.index!, 0];
@@ -130,9 +132,12 @@ export class PanelView extends LitElement implements LovelaceViewElement {
       :host {
         display: block;
         height: 100%;
+        --restore-card-border-radius: var(--ha-card-border-radius, 12px);
+        --restore-card-border-width: var(--ha-card-border-width, 1px);
+        --restore-card-box-shadow: var(--ha-card-box-shadow, none);
       }
 
-      * {
+      [no-border] {
         --ha-card-border-radius: 0;
         --ha-card-border-width: 0;
         --ha-card-box-shadow: none;