diff --git a/src/panels/config/zha/zha-add-devices-page.ts b/src/panels/config/zha/zha-add-devices-page.ts
index 05d627c80a..f4a4765828 100644
--- a/src/panels/config/zha/zha-add-devices-page.ts
+++ b/src/panels/config/zha/zha-add-devices-page.ts
@@ -170,7 +170,7 @@ class ZHAAddDevicesPage extends LitElement {
     this._active = true;
     this._addDevicesTimeoutHandle = setTimeout(
       () => this._unsubscribe(),
-      75000
+      120000
     );
   }
 
diff --git a/src/panels/config/zha/zha-device-card.ts b/src/panels/config/zha/zha-device-card.ts
index ec00a3de10..312fe982c1 100644
--- a/src/panels/config/zha/zha-device-card.ts
+++ b/src/panels/config/zha/zha-device-card.ts
@@ -283,45 +283,50 @@ class ZHADeviceCard extends LitElement {
           this.showActions
             ? html`
                 <div class="card-actions">
-                  <mwc-button @click="${this._onReconfigureNodeClick}">
-                    ${this.hass!.localize(
-                      "ui.dialogs.zha_device_info.buttons.reconfigure"
-                    )}
-                  </mwc-button>
-                  ${this.showHelp
+                  ${this.device!.device_type !== "Coordinator"
                     ? html`
-                        <div class="help-text">
+                        <mwc-button @click=${this._onReconfigureNodeClick}>
                           ${this.hass!.localize(
-                            "ui.dialogs.zha_device_info.services.reconfigure"
+                            "ui.dialogs.zha_device_info.buttons.reconfigure"
                           )}
-                        </div>
-                      `
-                    : ""}
+                        </mwc-button>
+                        ${this.showHelp
+                          ? html`
+                              <div class="help-text">
+                                ${this.hass!.localize(
+                                  "ui.dialogs.zha_device_info.services.reconfigure"
+                                )}
+                              </div>
+                            `
+                          : ""}
 
-                  <ha-call-service-button
-                    .hass=${this.hass}
-                    domain="zha"
-                    service="remove"
-                    .confirmation=${this.hass!.localize(
-                      "ui.dialogs.zha_device_info.confirmations.remove"
-                    )}
-                    .serviceData="${this._serviceData}"
-                  >
-                    ${this.hass!.localize(
-                      "ui.dialogs.zha_device_info.buttons.remove"
-                    )}
-                  </ha-call-service-button>
-                  ${this.showHelp
-                    ? html`
-                        <div class="help-text">
-                          ${this.hass!.localize(
-                            "ui.dialogs.zha_device_info.services.remove"
+                        <ha-call-service-button
+                          .hass=${this.hass}
+                          domain="zha"
+                          service="remove"
+                          .confirmation=${this.hass!.localize(
+                            "ui.dialogs.zha_device_info.confirmations.remove"
                           )}
-                        </div>
+                          .serviceData=${this._serviceData}
+                        >
+                          ${this.hass!.localize(
+                            "ui.dialogs.zha_device_info.buttons.remove"
+                          )}
+                        </ha-call-service-button>
+                        ${this.showHelp
+                          ? html`
+                              <div class="help-text">
+                                ${this.hass!.localize(
+                                  "ui.dialogs.zha_device_info.services.remove"
+                                )}
+                              </div>
+                            `
+                          : ""}
                       `
                     : ""}
                   ${this.device!.power_source === "Mains" &&
-                  this.device!.device_type === "Router"
+                  (this.device!.device_type === "Router" ||
+                    this.device!.device_type === "Coordinator")
                     ? html`
                         <mwc-button @click=${this._onAddDevicesClick}>
                           ${this.hass!.localize(
diff --git a/src/panels/config/zha/zha-node.ts b/src/panels/config/zha/zha-node.ts
index b0f1468369..d7b93438d7 100644
--- a/src/panels/config/zha/zha-node.ts
+++ b/src/panels/config/zha/zha-node.ts
@@ -67,7 +67,7 @@ export class ZHANode extends LitElement {
                   showName
                   showModelInfo
                   .showEntityDetail=${false}
-                  .showActions="${this.device.device_type !== "Coordinator"}"
+                  showActions
                   @zha-device-removed=${this._onDeviceRemoved}
                 ></zha-device-card>
               `