diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts
index 8fad6f7ca1..b7b8e7758c 100644
--- a/src/panels/lovelace/cards/hui-stack-card.ts
+++ b/src/panels/lovelace/cards/hui-stack-card.ts
@@ -35,6 +35,9 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
 
   @state() protected _config?: T;
 
+  @property({ type: Boolean, reflect: true })
+  public isPanel = false;
+
   public getCardSize(): number | Promise<number> {
     return 1;
   }
@@ -98,10 +101,10 @@ export abstract class HuiStackCard<T extends StackCardConfig = StackCardConfig>
         display: block;
         padding: 24px 16px 16px;
       }
-      #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);
+      :host([ispanel]) #root {
+        --ha-card-border-radius: var(--restore-card-border-radius);
+        --ha-card-border-width: var(--restore-card-border-width);
+        --ha-card-box-shadow: var(--restore-card-border-shadow);
       }
     `;
   }
diff --git a/src/panels/lovelace/views/hui-panel-view.ts b/src/panels/lovelace/views/hui-panel-view.ts
index a47eac437f..52f597eb5c 100644
--- a/src/panels/lovelace/views/hui-panel-view.ts
+++ b/src/panels/lovelace/views/hui-panel-view.ts
@@ -108,7 +108,6 @@ 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;
@@ -117,7 +116,6 @@ 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];
@@ -137,7 +135,7 @@ export class PanelView extends LitElement implements LovelaceViewElement {
         --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;