diff --git a/src/dialogs/generic/dialog-box.ts b/src/dialogs/generic/dialog-box.ts
index 212c181c27d1..c24d6d11ea00 100644
--- a/src/dialogs/generic/dialog-box.ts
+++ b/src/dialogs/generic/dialog-box.ts
@@ -27,7 +27,14 @@ class DialogBox extends LitElement {
 
   @query("ha-md-dialog") private _dialog?: HaMdDialog;
 
+  private _closePromise?: Promise<void>;
+
+  private _closeResolve?: () => void;
+
   public async showDialog(params: DialogBoxParams): Promise<void> {
+    if (this._closePromise) {
+      await this._closePromise;
+    }
     this._params = params;
   }
 
@@ -132,21 +139,24 @@ class DialogBox extends LitElement {
 
   private _dismiss(): void {
     this._closeState = "canceled";
-    this._closeDialog();
     this._cancel();
+    this._closeDialog();
   }
 
   private _confirm(): void {
     this._closeState = "confirmed";
-    this._closeDialog();
     if (this._params!.confirm) {
       this._params!.confirm(this._textField?.value);
     }
+    this._closeDialog();
   }
 
   private _closeDialog() {
     fireEvent(this, "dialog-closed", { dialog: this.localName });
     this._dialog?.close();
+    this._closePromise = new Promise((resolve) => {
+      this._closeResolve = resolve;
+    });
   }
 
   private _dialogClosed() {
@@ -156,6 +166,8 @@ class DialogBox extends LitElement {
     }
     this._closeState = undefined;
     this._params = undefined;
+    this._closeResolve?.();
+    this._closeResolve = undefined;
   }
 
   static get styles(): CSSResultGroup {