diff --git a/src/panels/lovelace/views/hui-view.ts b/src/panels/lovelace/views/hui-view.ts
index 279741e6f8..a3b9d1e8ba 100644
--- a/src/panels/lovelace/views/hui-view.ts
+++ b/src/panels/lovelace/views/hui-view.ts
@@ -224,6 +224,9 @@ export class HUIView extends LitElement {
       });
       this._createColumns(wrappedCards);
     } else {
+      this._cards.forEach((card) => {
+        (card as LovelaceCard).editMode = false;
+      });
       this._createColumns(this._cards);
     }
   }