diff --git a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
index 404c0df8eb..0f58b84822 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
@@ -128,6 +128,9 @@ export class HuiCardEditor extends LitElement {
   }
 
   public refreshYamlEditor(focus = false) {
+    if (this._configElement?.refreshYamlEditor) {
+      this._configElement.refreshYamlEditor(focus);
+    }
     if (!this._yamlEditor?.codemirror) {
       return;
     }
diff --git a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
index 0086ec0b1c..daf244defb 100644
--- a/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-conditional-card-editor.ts
@@ -56,6 +56,10 @@ export class HuiConditionalCardEditor extends LitElement
     this._config = cardConfigStruct(config);
   }
 
+  public refreshYamlEditor(focus) {
+    this._cardEditorEl?.refreshYamlEditor(focus);
+  }
+
   protected render(): TemplateResult {
     if (!this.hass || !this._config) {
       return html``;
@@ -195,7 +199,7 @@ export class HuiConditionalCardEditor extends LitElement
   private _setMode(value: boolean): void {
     this._GUImode = value;
     if (this._cardEditorEl) {
-      this._cardEditorEl!.GUImode = value;
+      this._cardEditorEl.GUImode = value;
     }
   }
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
index 6b46e48ec5..33c0cfbeb3 100644
--- a/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-stack-card-editor.ts
@@ -51,6 +51,10 @@ export class HuiStackCardEditor extends LitElement
     this._config = cardConfigStruct(config);
   }
 
+  public refreshYamlEditor(focus) {
+    this._cardEditorEl?.refreshYamlEditor(focus);
+  }
+
   protected render(): TemplateResult {
     if (!this.hass || !this._config) {
       return html``;
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index c2623ec683..adfcd98e01 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -57,4 +57,5 @@ export interface LovelaceCardEditor extends HTMLElement {
   hass?: HomeAssistant;
   lovelace?: LovelaceConfig;
   setConfig(config: LovelaceCardConfig): void;
+  refreshYamlEditor?: (focus: boolean) => void;
 }