diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
index e75a279163..379be4c30d 100755
--- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts
@@ -86,7 +86,7 @@ export class HuiDialogEditCard extends LitElement {
     }
 
     return html`
-      <ha-paper-dialog with-backdrop opened modal>
+      <ha-paper-dialog with-backdrop opened modal @keyup=${this._handleKeyUp}>
         <h2>
           ${heading}
         </h2>
@@ -264,6 +264,12 @@ export class HuiDialogEditCard extends LitElement {
     this._error = ev.detail.error;
   }
 
+  private _handleKeyUp(ev: KeyboardEvent) {
+    if (ev.keyCode === 27) {
+      this._close();
+    }
+  }
+
   private _close(): void {
     this._params = undefined;
     this._cardConfig = undefined;