From 6c918e346b044f1911b5cfe43698466c02b7a4ae Mon Sep 17 00:00:00 2001
From: "David F. Mulcahey" <david.mulcahey@me.com>
Date: Mon, 17 Aug 2020 08:17:18 -0400
Subject: [PATCH] Fix navigation after ZHA device removal (#6638)

---
 .../integration-elements/zha/ha-device-actions-zha.ts         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-actions-zha.ts b/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-actions-zha.ts
index d5d98dc68d..d6629b58c5 100644
--- a/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-actions-zha.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zha/ha-device-actions-zha.ts
@@ -119,9 +119,11 @@ export class HaDeviceActionsZha extends LitElement {
       return;
     }
 
-    this.hass.callService("zha", "remove", {
+    await this.hass.callService("zha", "remove", {
       ieee_address: this._zhaDevice!.ieee,
     });
+
+    history.back();
   }
 
   static get styles(): CSSResult[] {