From 1b0d8bba29c2b5d5000d5b8afda12b226865881b Mon Sep 17 00:00:00 2001
From: "David F. Mulcahey" <david.mulcahey@me.com>
Date: Thu, 2 Jan 2020 04:50:19 -0500
Subject: [PATCH] fix area index on ZHA device card (#4406)

---
 src/panels/config/zha/zha-device-card.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/panels/config/zha/zha-device-card.ts b/src/panels/config/zha/zha-device-card.ts
index 14d909a723..268f3b6d03 100644
--- a/src/panels/config/zha/zha-device-card.ts
+++ b/src/panels/config/zha/zha-device-card.ts
@@ -81,6 +81,12 @@ class ZHADeviceCard extends LitElement {
     super.connectedCallback();
     this._unsubAreas = subscribeAreaRegistry(this.hass.connection, (areas) => {
       this._areas = areas;
+      if (this.device) {
+        this._selectedAreaIndex =
+          this._areas.findIndex(
+            (area) => area.area_id === this.device!.area_id
+          ) + 1; // account for the no area selected index
+      }
     });
     this.hass.connection
       .subscribeEvents((event: HassEvent) => {