diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts
index 36aa892040..02d5a395bd 100644
--- a/src/panels/lovelace/hui-editor.ts
+++ b/src/panels/lovelace/hui-editor.ts
@@ -38,6 +38,7 @@ class LovelaceFullConfigEditor extends LitElement {
     return {
       hass: {},
       lovelace: {},
+      closeEditor: {},
       _saving: {},
       _changed: {},
     };
@@ -150,7 +151,9 @@ class LovelaceFullConfigEditor extends LitElement {
       }
     }
     window.onbeforeunload = null;
-    this.closeEditor!();
+    if (this.closeEditor) {
+      this.closeEditor();
+    }
   }
 
   private async _handleSave() {