diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts
index 3b7f0ccbed..5d5d46c2de 100644
--- a/src/panels/config/areas/dialog-area-registry-detail.ts
+++ b/src/panels/config/areas/dialog-area-registry-detail.ts
@@ -344,6 +344,7 @@ class DialogAreaDetail
         header-title=${entry
           ? this.hass.localize("ui.panel.config.areas.editor.update_area")
           : this.hass.localize("ui.panel.config.areas.editor.create_area")}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <ha-suggest-with-ai-button
@@ -374,7 +375,13 @@ class DialogAreaDetail
                   ${this.hass.localize("ui.common.delete")}
                 </ha-button>
               `
-            : nothing}
+            : html`<ha-button
+                appearance="plain"
+                slot="secondaryAction"
+                @click=${this.closeDialog}
+              >
+                ${this.hass.localize("ui.common.cancel")}
+              </ha-button>`}
           <ha-button
             slot="primaryAction"
             @click=${this._updateEntry}
diff --git a/src/panels/config/areas/dialog-floor-registry-detail.ts b/src/panels/config/areas/dialog-floor-registry-detail.ts
index be05dde120..c731821771 100644
--- a/src/panels/config/areas/dialog-floor-registry-detail.ts
+++ b/src/panels/config/areas/dialog-floor-registry-detail.ts
@@ -112,6 +112,7 @@ class DialogFloorDetail extends LitElement {
         header-title=${entry
           ? this.hass.localize("ui.panel.config.floors.editor.update_floor")
           : this.hass.localize("ui.panel.config.floors.editor.create_floor")}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <div>
diff --git a/src/panels/config/backup/dialogs/dialog-local-backup-location.ts b/src/panels/config/backup/dialogs/dialog-local-backup-location.ts
index f36d610e89..b988faa204 100644
--- a/src/panels/config/backup/dialogs/dialog-local-backup-location.ts
+++ b/src/panels/config/backup/dialogs/dialog-local-backup-location.ts
@@ -69,6 +69,7 @@ class LocalBackupLocationDialog extends LitElement {
         header-title=${this.hass.localize(
           `ui.panel.config.backup.dialogs.local_backup_location.title`
         )}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         ${this._error
diff --git a/src/panels/config/category/dialog-category-registry-detail.ts b/src/panels/config/category/dialog-category-registry-detail.ts
index eab6da4cb3..3cc87ac5e9 100644
--- a/src/panels/config/category/dialog-category-registry-detail.ts
+++ b/src/panels/config/category/dialog-category-registry-detail.ts
@@ -71,6 +71,7 @@ class DialogCategoryDetail extends LitElement {
         header-title=${entry
           ? this.hass.localize("ui.panel.config.category.editor.edit")
           : this.hass.localize("ui.panel.config.category.editor.create")}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         ${this._error
diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts
index 5f205b175f..a64ccdb7b1 100644
--- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts
+++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-change-channel.ts
@@ -74,6 +74,7 @@ class DialogZHAChangeChannel extends LitElement {
         header-title=${this.hass.localize(
           "ui.panel.config.zha.change_channel_dialog.title"
         )}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <ha-alert alert-type="warning">
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts
index b0a44e84a7..aa7ab6ec82 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-node.ts
@@ -105,6 +105,7 @@ class DialogZWaveJSRemoveNode extends LitElement {
         .hass=${this.hass}
         .open=${this._open}
         header-title=${dialogTitle}
+        prevent-scrim-close
         @closed=${this.handleDialogClosed}
       >
         <ha-icon-button
diff --git a/src/panels/config/labels/dialog-label-detail.ts b/src/panels/config/labels/dialog-label-detail.ts
index 40898f532f..abf1bd1c35 100644
--- a/src/panels/config/labels/dialog-label-detail.ts
+++ b/src/panels/config/labels/dialog-label-detail.ts
@@ -79,6 +79,7 @@ class DialogLabelDetail
         header-title=${this._params.entry
           ? this._params.entry.name || this._params.entry.label_id
           : this.hass!.localize("ui.dialogs.label-detail.new_label")}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <div>
@@ -135,7 +136,15 @@ class DialogLabelDetail
                   ${this.hass!.localize("ui.common.delete")}
                 </ha-button>
               `
-            : nothing}
+            : html`
+                <ha-button
+                  appearance="plain"
+                  slot="secondaryAction"
+                  @click=${this.closeDialog}
+                >
+                  ${this.hass.localize("ui.common.cancel")}
+                </ha-button>
+              `}
           <ha-button
             slot="primaryAction"
             @click=${this._updateEntry}
diff --git a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
index 3291dd126d..e605d783d2 100644
--- a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
+++ b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
@@ -69,6 +69,16 @@ export class DialogLovelaceDashboardDetail extends LitElement {
 
     const titleInvalid = !this._data.title || !this._data.title.trim();
 
+    const cancelButton = html`
+      <ha-button
+        appearance="plain"
+        slot="secondaryAction"
+        @click=${this.closeDialog}
+      >
+        ${this.hass.localize("ui.common.cancel")}
+      </ha-button>
+    `;
+
     return html`
       <ha-dialog
         .hass=${this.hass}
@@ -81,6 +91,7 @@ export class DialogLovelaceDashboardDetail extends LitElement {
           : this.hass.localize(
               "ui.panel.config.lovelace.dashboards.detail.new_dashboard"
             )}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <div>
@@ -117,9 +128,9 @@ export class DialogLovelaceDashboardDetail extends LitElement {
                         )}
                       </ha-button>
                     `
-                  : nothing}
+                  : cancelButton}
               `
-            : nothing}
+            : cancelButton}
           <ha-button
             slot="primaryAction"
             @click=${this._updateDashboard}
diff --git a/src/panels/config/person/dialog-person-detail.ts b/src/panels/config/person/dialog-person-detail.ts
index b16dfa49b4..e4de4b4afb 100644
--- a/src/panels/config/person/dialog-person-detail.ts
+++ b/src/panels/config/person/dialog-person-detail.ts
@@ -253,14 +253,13 @@ class DialogPersonDetail extends LitElement implements HassDialog {
                   ${this.hass!.localize("ui.panel.config.person.detail.delete")}
                 </ha-button>
               `
-            : nothing}
-          <ha-button
-            slot="secondaryAction"
-            appearance="plain"
-            @click=${this.closeDialog}
-          >
-            ${this.hass!.localize("ui.common.cancel")}
-          </ha-button>
+            : html`<ha-button
+                slot="secondaryAction"
+                appearance="plain"
+                @click=${this.closeDialog}
+              >
+                ${this.hass!.localize("ui.common.cancel")}
+              </ha-button>`}
           <ha-button
             slot="primaryAction"
             @click=${this._updateEntry}
diff --git a/src/panels/config/users/dialog-user-detail.ts b/src/panels/config/users/dialog-user-detail.ts
index 26f0b60715..c40a13af41 100644
--- a/src/panels/config/users/dialog-user-detail.ts
+++ b/src/panels/config/users/dialog-user-detail.ts
@@ -244,33 +244,26 @@ class DialogUserDetail extends LitElement {
         </div>
 
         <ha-dialog-footer slot="footer">
-        <ha-button
-          slot="secondaryAction"
-          variant="danger"
-          appearance="plain"
-          @click=${this._deleteEntry}
-            .disabled=${
-              this._submitting || user.system_generated || user.is_owner
-            }
-        >
-          ${this.hass!.localize("ui.panel.config.users.editor.delete_user")}
-        </ha-button>
-        <ha-button
+          <ha-button
             slot="secondaryAction"
-          appearance="plain"
-          @click=${this._close}
-        >
-          ${this.hass!.localize("ui.common.cancel")}
-        </ha-button>
-        <ha-button
-          slot="primaryAction"
-          @click=${this._updateEntry}
-            .disabled=${
-              !this._name || this._submitting || user.system_generated
-            }
-        >
-          ${this.hass!.localize("ui.common.save")}
-        </ha-button>
+            variant="danger"
+            appearance="plain"
+            @click=${this._deleteEntry}
+              .disabled=${
+                this._submitting || user.system_generated || user.is_owner
+              }
+          >
+            ${this.hass!.localize("ui.panel.config.users.editor.delete_user")}
+          </ha-button>
+          <ha-button
+            slot="primaryAction"
+            @click=${this._updateEntry}
+              .disabled=${
+                !this._name || this._submitting || user.system_generated
+              }
+          >
+            ${this.hass!.localize("ui.common.save")}
+          </ha-button>
         </ha-dialog-footer>
       </ha-dialog>
     `;
diff --git a/src/panels/config/voice-assistants/dialog-expose-entity.ts b/src/panels/config/voice-assistants/dialog-expose-entity.ts
index 662cdd3f22..e6a530c26c 100644
--- a/src/panels/config/voice-assistants/dialog-expose-entity.ts
+++ b/src/panels/config/voice-assistants/dialog-expose-entity.ts
@@ -92,6 +92,7 @@ class DialogExposeEntity extends LitElement {
         width="medium"
         header-title=${header}
         header-subtitle=${subtitle}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <search-input
diff --git a/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts b/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
index f13c669725..4173276e43 100644
--- a/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
+++ b/src/panels/config/voice-assistants/dialog-voice-assistant-pipeline-detail.ts
@@ -146,6 +146,7 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
         .hass=${this.hass}
         .open=${this._open}
         header-title=${title}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         ${!this._hideWakeWord ||
@@ -223,6 +224,13 @@ export class DialogVoiceAssistantPipelineDetail extends LitElement {
               ></assist-pipeline-detail-wakeword>`}
         </div>
         <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="secondaryAction"
+            appearance="plain"
+            @click=${this.closeDialog}
+          >
+            ${this.hass.localize("ui.common.cancel")}
+          </ha-button>
           <ha-button
             slot="primaryAction"
             @click=${this._updatePipeline}
diff --git a/src/panels/config/zone/dialog-home-zone-detail.ts b/src/panels/config/zone/dialog-home-zone-detail.ts
index a2d7739848..4df271ff8d 100644
--- a/src/panels/config/zone/dialog-home-zone-detail.ts
+++ b/src/panels/config/zone/dialog-home-zone-detail.ts
@@ -72,6 +72,7 @@ class DialogHomeZoneDetail extends LitElement {
         header-title=${this.hass!.localize("ui.common.edit_item", {
           name: this._data.name,
         })}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <ha-form
diff --git a/src/panels/config/zone/dialog-zone-detail.ts b/src/panels/config/zone/dialog-zone-detail.ts
index 6022b0c25e..f8f96335eb 100644
--- a/src/panels/config/zone/dialog-zone-detail.ts
+++ b/src/panels/config/zone/dialog-zone-detail.ts
@@ -94,6 +94,7 @@ class DialogZoneDetail extends LitElement {
               name: this._params.entry.name,
             })
           : this.hass!.localize("ui.panel.config.zone.detail.new_zone")}
+        prevent-scrim-close
         @closed=${this._dialogClosed}
       >
         <ha-form