From 78a1e45be20cb1986f97919991048379da4519ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= <joasoe@gmail.com>
Date: Sun, 30 Aug 2020 09:42:58 +0200
Subject: [PATCH] Dismiss dialog if the user clicks outside it or hit the
 escape button (#6741)

Co-authored-by: Bram Kragten <mail@bramkragten.nl>
---
 hassio/src/dialogs/network/dialog-hassio-network.ts | 9 ++++++++-
 src/dialogs/generic/dialog-box.ts                   | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hassio/src/dialogs/network/dialog-hassio-network.ts b/hassio/src/dialogs/network/dialog-hassio-network.ts
index 4eea315d9c..f49d1c1a86 100644
--- a/hassio/src/dialogs/network/dialog-hassio-network.ts
+++ b/hassio/src/dialogs/network/dialog-hassio-network.ts
@@ -90,7 +90,14 @@ export class DialogHassioNetwork extends LitElement implements HassDialog {
     }
 
     return html`
-      <ha-dialog open .heading=${true} hideActions @closed=${this.closeDialog}>
+      <ha-dialog
+        open
+        scrimClickAction
+        escapeKeyAction
+        .heading=${true}
+        hideActions
+        @closed=${this.closeDialog}
+      >
         <div slot="heading">
           <ha-header-bar>
             <span slot="title">
diff --git a/src/dialogs/generic/dialog-box.ts b/src/dialogs/generic/dialog-box.ts
index 0663b6bfe7..b8fcea9a70 100644
--- a/src/dialogs/generic/dialog-box.ts
+++ b/src/dialogs/generic/dialog-box.ts
@@ -55,9 +55,9 @@ class DialogBox extends LitElement {
     return html`
       <ha-dialog
         open
-        scrimClickAction
-        escapeKeyAction
-        @close=${this._close}
+        ?scrimClickAction=${this._params.prompt}
+        ?escapeKeyAction=${this._params.prompt}
+        @closed=${this._dismiss}
         .heading=${this._params.title
           ? this._params.title
           : this._params.confirmation &&