diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index 98a97411c8..8cf00fd008 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -128,6 +128,7 @@ class LovelacePanel extends LitElement {
     } else if (this.lovelace && this.lovelace.mode === "generated") {
       // When lovelace is generated, we re-generate each time a user goes
       // to the states panel to make sure new entities are shown.
+      this._state = "loading";
       this._regenerateConfig();
     }
   }
@@ -135,6 +136,7 @@ class LovelacePanel extends LitElement {
   private async _regenerateConfig() {
     const conf = await generateLovelaceConfig(this.hass!, this.hass!.localize);
     this._setLovelaceConfig(conf, "generated");
+    this._state = "loaded";
   }
 
   private _closeEditor() {
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index f6f887d4a8..551386417c 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -399,6 +399,7 @@ class HUIRoot extends LitElement {
         views
       ) {
         navigate(this, `/lovelace/${views[0].path || 0}`, true);
+        newSelectView = 0;
       } else if (this._routeData!.view === "hass-unused-entities") {
         newSelectView = "hass-unused-entities";
       } else if (this._routeData!.view) {