diff --git a/src/components/ha-items-display-editor.ts b/src/components/ha-items-display-editor.ts
index 1fb1477636..c08709249f 100644
--- a/src/components/ha-items-display-editor.ts
+++ b/src/components/ha-items-display-editor.ts
@@ -143,9 +143,11 @@ export class HaItemDisplayEditor extends LitElement {
                           `
                         : nothing}
                   ${this.showNavigationButton
-                    ? html`<ha-icon-next slot="end"></ha-icon-next>`
+                    ? html`
+                        <ha-icon-next slot="end"></ha-icon-next>
+                        <div slot="end" class="separator"></div>
+                      `
                     : nothing}
-                  <div slot="end" class="separator"></div>
                   ${this.actionsRenderer
                     ? html`
                         <div slot="end" @click=${stopPropagation}>
diff --git a/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts b/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts
index c57efcc38e..de56c9d487 100644
--- a/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts
+++ b/src/panels/lovelace/editor/dashboard-strategy-editor/dialogs/dialog-dashboard-strategy-editor.ts
@@ -215,8 +215,8 @@ class DialogDashboardStrategyEditor extends LitElement {
           --dialog-content-padding: 0 24px;
           --dialog-surface-position: fixed;
           --dialog-surface-top: 40px;
-          --mdc-dialog-min-width: min(600px, calc(100% - 32px));
-          --mdc-dialog-max-width: calc(100% - 32px);
+          --mdc-dialog-min-width: min(640px, calc(100% - 32px));
+          --mdc-dialog-max-width: min(640px, calc(100% - 32px));
           --mdc-dialog-max-height: calc(100% - 80px);
         }
 
diff --git a/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts b/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts
index 8dcb6e2705..8a8ffff4b5 100644
--- a/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts
+++ b/src/panels/lovelace/strategies/areas/editor/hui-areas-dashboard-strategy-editor.ts
@@ -1,6 +1,8 @@
 import { mdiThermometerWater } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { cache } from "lit/directives/cache";
+import { keyed } from "lit/directives/keyed";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-areas-display-editor";
@@ -55,12 +57,23 @@ export class HuiAreasDashboardStrategyEditor
       return nothing;
     }
 
-    if (this._area) {
-      const groups = getAreaGroupedEntities(this._area, this.hass);
+    return cache(
+      this._area ? this._renderOverviewEditor() : this._renderAreaEditor()
+    );
+  }
 
-      const area = this.hass.areas[this._area];
+  private _renderOverviewEditor() {
+    if (!this.hass || !this._config || !this._area) {
+      return nothing;
+    }
 
-      return html`
+    const groups = getAreaGroupedEntities(this._area, this.hass);
+
+    const area = this.hass.areas[this._area];
+
+    return keyed(
+      area.area_id,
+      html`
         <div class="toolbar">
           <ha-icon-button-prev @click=${this._back}></ha-icon-button-prev>
           <p>${area.name}</p>
@@ -69,6 +82,7 @@ export class HuiAreasDashboardStrategyEditor
           .header=${this.hass!.localize(
             `ui.panel.lovelace.strategy.areas.sensors`
           )}
+          left-chevron
           expanded
           outlined
         >
@@ -101,6 +115,7 @@ export class HuiAreasDashboardStrategyEditor
               .header=${this.hass!.localize(
                 `ui.panel.lovelace.strategy.areas.groups.${group}`
               )}
+              left-chevron
               expanded
               outlined
             >
@@ -108,7 +123,7 @@ export class HuiAreasDashboardStrategyEditor
                 slot="leading-icon"
                 .icon=${AREA_STRATEGY_GROUP_ICONS[group]}
               ></ha-icon>
-              ${entities.length
+              ${entities.length > 0
                 ? html`
                     <ha-entities-display-editor
                       .hass=${this.hass}
@@ -130,7 +145,13 @@ export class HuiAreasDashboardStrategyEditor
             </ha-expansion-panel>
           `;
         })}
-      `;
+      `
+    );
+  }
+
+  private _renderAreaEditor() {
+    if (!this.hass || !this._config) {
+      return nothing;
     }
 
     const value = this._areasFloorsDisplayValue(this._config);
@@ -286,7 +307,6 @@ export class HuiAreasDashboardStrategyEditor
         }
         ha-expansion-panel {
           margin-bottom: 8px;
-          max-width: 600px;
           --expansion-panel-summary-padding: 0 16px;
         }
         ha-expansion-panel [slot="leading-icon"] {