From dbdbad2deb2d8bdb87018021a1d2302f3d534f12 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 11 Mar 2020 15:23:31 +0100
Subject: [PATCH] Fix closing hui-editor (#5132)

---
 src/panels/lovelace/hui-editor.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts
index 17b76f8bd1..758ea6911d 100644
--- a/src/panels/lovelace/hui-editor.ts
+++ b/src/panels/lovelace/hui-editor.ts
@@ -166,21 +166,23 @@ class LovelaceFullConfigEditor extends LitElement {
     }
   }
 
-  private _closeEditor() {
-    if (this._changed) {
-      showConfirmationDialog(this, {
+  private async _closeEditor() {
+    if (
+      this._changed &&
+      !(await showConfirmationDialog(this, {
         text: this.hass.localize(
           "ui.panel.lovelace.editor.raw_editor.confirm_unsaved_changes"
         ),
         dismissText: this.hass!.localize("ui.common.no"),
         confirmText: this.hass!.localize("ui.common.yes"),
-        confirm: () => {
-          window.onbeforeunload = null;
-          if (this.closeEditor) {
-            this.closeEditor();
-          }
-        },
-      });
+      }))
+    ) {
+      return;
+    }
+
+    window.onbeforeunload = null;
+    if (this.closeEditor) {
+      this.closeEditor();
     }
   }