diff --git a/src/panels/config/person/dialog-person-detail.ts b/src/panels/config/person/dialog-person-detail.ts
index 98ff7bbadb..13c957dea5 100644
--- a/src/panels/config/person/dialog-person-detail.ts
+++ b/src/panels/config/person/dialog-person-detail.ts
@@ -79,6 +79,7 @@ class DialogPersonDetail extends LitElement {
           ${this._error ? html` <div class="error">${this._error}</div> ` : ""}
           <div class="form">
             <paper-input
+              dialogInitialFocus
               .value=${this._name}
               @value-changed=${this._nameChanged}
               label="${this.hass!.localize(
@@ -87,7 +88,8 @@ class DialogPersonDetail extends LitElement {
               error-message="${this.hass!.localize(
                 "ui.panel.config.person.detail.name_error_msg"
               )}"
-              .invalid=${nameInvalid}
+              required
+              auto-validate
             ></paper-input>
             <ha-user-picker
               label="${this.hass!.localize(
diff --git a/src/panels/config/zone/dialog-zone-detail.ts b/src/panels/config/zone/dialog-zone-detail.ts
index 71096cc4a4..51fcdad3b8 100644
--- a/src/panels/config/zone/dialog-zone-detail.ts
+++ b/src/panels/config/zone/dialog-zone-detail.ts
@@ -105,6 +105,7 @@ class DialogZoneDetail extends LitElement {
           ${this._error ? html` <div class="error">${this._error}</div> ` : ""}
           <div class="form">
             <paper-input
+              dialogInitialFocus
               .value=${this._name}
               .configValue=${"name"}
               @value-changed=${this._valueChanged}
@@ -114,7 +115,8 @@ class DialogZoneDetail extends LitElement {
               .errorMessage="${this.hass!.localize(
                 "ui.panel.config.zone.detail.required_error_msg"
               )}"
-              .invalid=${nameValid}
+              required
+              auto-validate
             ></paper-input>
             <paper-input
               .value=${this._icon}