diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts
index 8ab69fa05f..e25751c3ef 100644
--- a/src/panels/config/automation/ha-automation-editor.ts
+++ b/src/panels/config/automation/ha-automation-editor.ts
@@ -443,7 +443,9 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
         ),
         confirmText: this.hass!.localize("ui.common.leave"),
         dismissText: this.hass!.localize("ui.common.stay"),
-        confirm: () => history.back(),
+        confirm: () => {
+          setTimeout(() => history.back());
+        },
       });
     } else {
       history.back();
diff --git a/src/panels/config/automation/manual-automation-editor.ts b/src/panels/config/automation/manual-automation-editor.ts
index 97ea0d1d40..ff70b33195 100644
--- a/src/panels/config/automation/manual-automation-editor.ts
+++ b/src/panels/config/automation/manual-automation-editor.ts
@@ -267,7 +267,10 @@ export class HaManualAutomationEditor extends LitElement {
     const mode = ((ev.target as PaperListboxElement)?.selectedItem as any)
       ?.mode;
 
-    if (mode === this.config!.mode) {
+    if (
+      mode === this.config!.mode ||
+      (!this.config!.mode && mode === MODES[0])
+    ) {
       return;
     }
     const value = {
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 5d4b88933d..6444b6aaef 100644
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -263,7 +263,7 @@ export default class HaAutomationTriggerRow extends LitElement {
 
   private _idChanged(ev: CustomEvent) {
     const newId = ev.detail.value;
-    if (newId === this.trigger.id) {
+    if (newId === (this.trigger.id ?? "")) {
       return;
     }
     const value = { ...this.trigger };
diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts
index 6c51a61af4..45bbf6740a 100644
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -555,7 +555,7 @@ export class HaSceneEditor extends SubscribeMixin(
     try {
       config = await getSceneConfig(this.hass, this.sceneId!);
     } catch (err: any) {
-      showAlertDialog(this, {
+      await showAlertDialog(this, {
         text:
           err.status_code === 404
             ? this.hass.localize(
@@ -566,7 +566,8 @@ export class HaSceneEditor extends SubscribeMixin(
                 "err_no",
                 err.status_code
               ),
-      }).then(() => history.back());
+      });
+      history.back();
       return;
     }
 
diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts
index ccba2b3ecd..315f2dc2f3 100644
--- a/src/panels/config/script/ha-script-editor.ts
+++ b/src/panels/config/script/ha-script-editor.ts
@@ -586,7 +586,9 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
         ),
         confirmText: this.hass!.localize("ui.common.leave"),
         dismissText: this.hass!.localize("ui.common.stay"),
-        confirm: () => history.back(),
+        confirm: () => {
+          setTimeout(() => history.back());
+        },
       });
     } else {
       history.back();