From 9fada7ceece8820048c8ce4845840174fe7ce2ec Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Tue, 24 Mar 2026 18:01:30 +0100
Subject: [PATCH] Fix rebase

---
 src/panels/lovelace/hui-root.ts | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 69b902d741..10566b1f4b 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -787,7 +787,7 @@ class HUIRoot extends LitElement {
         | undefined;
 
       if (oldLovelace && oldLovelace.config !== this.lovelace!.config) {
-        this._cleanupViewCache(oldLovelace);
+        this._cleanupViewCache();
       }
 
       if (!oldLovelace || oldLovelace.editMode !== this.lovelace!.editMode) {
@@ -1146,22 +1146,14 @@ class HUIRoot extends LitElement {
     }
   }
 
-  private _cleanupViewCache(oldLovelace: Lovelace): void {
-    // Clean up cache entries for views that no longer exist
-    const newViewPaths = new Set(
-      this.lovelace!.config.views.map((v, i) => v.path ?? String(i))
-    );
-    const keys = new Set([
-      ...Object.keys(this._viewCache),
-      ...Object.keys(this._viewScrollPositions),
-    ]);
-    for (const key of keys) {
-      const index = Number(key);
-      const oldPath = oldLovelace.config.views[index]?.path ?? String(index);
-      if (!newViewPaths.has(oldPath)) {
-        delete this._viewCache[key];
-        delete this._viewScrollPositions[key];
-      }
+  private _cleanupViewCache(): void {
+    // Keep only the currently displayed view to avoid UI flash.
+    // All other cached views are cleared and will be recreated on next visit.
+    const currentView =
+      this._curView != null ? this._viewCache[this._curView] : undefined;
+    this._viewCache = {};
+    if (currentView && this._curView != null) {
+      this._viewCache[this._curView] = currentView;
     }
   }