diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
index 2e2f80c29d..1ff7f143d2 100644
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -254,11 +254,6 @@ export default class HaAutomationActionRow extends LitElement {
                         )}
                       `
                     : ""}
-                  <h2>
-                    ${this.hass.localize(
-                      "ui.panel.config.automation.editor.edit_yaml"
-                    )}
-                  </h2>
                   <ha-yaml-editor
                     .hass=${this.hass}
                     .defaultValue=${this.action}
@@ -307,6 +302,7 @@ export default class HaAutomationActionRow extends LitElement {
         break;
       case 1:
         this._switchYamlMode();
+        this.expand();
         break;
       case 2:
         fireEvent(this, "duplicate");
diff --git a/src/panels/config/automation/condition/ha-automation-condition-editor.ts b/src/panels/config/automation/condition/ha-automation-condition-editor.ts
index 45b026695f..bcb3727209 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-editor.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-editor.ts
@@ -50,11 +50,6 @@ export default class HaAutomationConditionEditor extends LitElement {
                   )}
                 `
               : ""}
-            <h2>
-              ${this.hass.localize(
-                "ui.panel.config.automation.editor.edit_yaml"
-              )}
-            </h2>
             <ha-yaml-editor
               .hass=${this.hass}
               .defaultValue=${this.condition}
diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts
index 4ccf7fedd8..fd77ce8783 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -2,7 +2,7 @@ import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
 import "@material/mwc-list/mwc-list-item";
 import { mdiDotsVertical } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
@@ -21,7 +21,6 @@ import { haStyle } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
 import "./ha-automation-condition-editor";
 import { validateConfig } from "../../../../data/config";
-import { HaYamlEditor } from "../../../../components/ha-yaml-editor";
 import { describeCondition } from "../../../../data/automation_i18n";
 
 export interface ConditionElement extends LitElement {
@@ -65,8 +64,6 @@ export default class HaAutomationConditionRow extends LitElement {
 
   @state() private _warnings?: string[];
 
-  @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;
-
   protected render() {
     if (!this.condition) {
       return html``;
@@ -191,6 +188,7 @@ export default class HaAutomationConditionRow extends LitElement {
     switch (ev.detail.index) {
       case 0:
         this._switchYamlMode();
+        this.expand();
         break;
       case 1:
         fireEvent(this, "duplicate");
@@ -208,9 +206,6 @@ export default class HaAutomationConditionRow extends LitElement {
     const enabled = !(this.condition.enabled ?? true);
     const value = { ...this.condition, enabled };
     fireEvent(this, "value-changed", { value });
-    if (this._yamlMode) {
-      this._yamlEditor?.setValue(value);
-    }
   }
 
   private _onDelete() {
diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
index a565bcae4f..d6f32bf995 100644
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -195,11 +195,6 @@ export default class HaAutomationTriggerRow extends LitElement {
                         )}
                       `
                     : ""}
-                  <h2>
-                    ${this.hass.localize(
-                      "ui.panel.config.automation.editor.edit_yaml"
-                    )}
-                  </h2>
                   <ha-yaml-editor
                     .hass=${this.hass}
                     .defaultValue=${this.trigger}
@@ -337,6 +332,7 @@ export default class HaAutomationTriggerRow extends LitElement {
         break;
       case 1:
         this._switchYamlMode();
+        this.expand();
         break;
       case 2:
         fireEvent(this, "duplicate");