diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts
index 64082db26670..dd339585849f 100644
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -164,6 +164,7 @@ export class MoreInfoDialog extends LitElement {
                     .label=${this.hass.localize(
                       "ui.dialogs.more_info_control.details"
                     )}
+                    dialogInitialFocus
                   ></mwc-tab>
                   <mwc-tab
                     .label=${this.hass.localize(
@@ -174,7 +175,7 @@ export class MoreInfoDialog extends LitElement {
               `
             : ""}
         </div>
-        <div class="content">
+        <div class="content" tabindex="-1" dialogInitialFocus>
           ${cache(
             this._currTabIndex === 0
               ? html`
diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts
index 9bbb35de18ea..3fadb0ea581c 100644
--- a/src/panels/config/areas/dialog-area-registry-detail.ts
+++ b/src/panels/config/areas/dialog-area-registry-detail.ts
@@ -92,6 +92,7 @@ class DialogAreaDetail extends LitElement {
                 "ui.panel.config.areas.editor.name_required"
               )}
               .invalid=${nameInvalid}
+              dialogInitialFocus
             ></paper-input>
             <ha-picture-upload
               .hass=${this.hass}
diff --git a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
index 677820ce124e..7d96306f867c 100644
--- a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
+++ b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
@@ -68,6 +68,7 @@ class DialogDeviceRegistryDetail extends LitElement {
               .label=${this.hass.localize("ui.panel.config.devices.name")}
               .placeholder=${device.name || ""}
               .disabled=${this._submitting}
+              dialogInitialFocus
             ></paper-input>
             <ha-area-picker
               .hass=${this.hass}
diff --git a/src/panels/config/entities/dialog-entity-editor.ts b/src/panels/config/entities/dialog-entity-editor.ts
index 74ff01d8f28b..ece37b53481a 100644
--- a/src/panels/config/entities/dialog-entity-editor.ts
+++ b/src/panels/config/entities/dialog-entity-editor.ts
@@ -115,6 +115,7 @@ export class DialogEntityEditor extends LitElement {
               .label=${this.hass.localize(
                 "ui.dialogs.entity_registry.settings"
               )}
+              dialogInitialFocus
             >
             </mwc-tab>
             ${Object.entries(this._extraTabs).map(