diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
index 392b0049a3..d6a1b460a9 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
@@ -597,6 +597,8 @@ class DialogZWaveJSAddNode extends LitElement {
     } catch (err: any) {
       this._error = err.message;
       this._status = "validate_dsk_enter_pin";
+      await this.updateComplete;
+      this._pinInput?.focus();
     }
   }