diff --git a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
index 4d884e469c..49a7ad7511 100644
--- a/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
+++ b/src/panels/lovelace/editor/card-editor/hui-card-editor.ts
@@ -158,6 +158,7 @@ export class HuiCardEditor extends LitElement {
                   .error=${this._error}
                   .rtl=${computeRTL(this.hass)}
                   @value-changed=${this._handleYAMLChanged}
+                  @keydown=${this._ignoreKeydown}
                 ></ha-code-editor>
               </div>
             `}
@@ -280,6 +281,10 @@ export class HuiCardEditor extends LitElement {
     }
   }
 
+  private _ignoreKeydown(ev: KeyboardEvent) {
+    ev.stopPropagation();
+  }
+
   static get styles(): CSSResult {
     return css`
       :host {
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 93ae17ff3f..dae6c63033 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
@@ -119,8 +119,8 @@ export class HuiDialogEditCard extends LitElement {
       <ha-dialog
         open
         scrimClickAction
-        escapeKeyAction
-        @keyup=${this._handleKeyUp}
+        @keydown=${this._ignoreKeydown}
+        @closed=${this._close}
         .heading=${html`${heading}
         ${this._documentationURL !== undefined
           ? html`
@@ -156,6 +156,7 @@ export class HuiDialogEditCard extends LitElement {
                       .value=${this._cardConfig}
                       @config-changed=${this._handleConfigChanged}
                       @GUImode-changed=${this._handleGUIModeChanged}
+                      @editor-save=${this._save}
                     ></hui-card-editor>
                   </div>
                   <div class="element-preview">
@@ -192,26 +193,33 @@ export class HuiDialogEditCard extends LitElement {
               </mwc-button>
             `
           : ""}
-        <mwc-button slot="primaryAction" @click=${this._close}>
-          ${this.hass!.localize("ui.common.cancel")}
-        </mwc-button>
-        ${this._cardConfig !== undefined
-          ? html`
-              <mwc-button
-                slot="primaryAction"
-                ?disabled=${!this._canSave || this._saving}
-                @click=${this._save}
-              >
-                ${this._saving
-                  ? html` <paper-spinner active alt="Saving"></paper-spinner> `
-                  : this.hass!.localize("ui.common.save")}
-              </mwc-button>
-            `
-          : ``}
+        <div slot="primaryAction" @click=${this._save}>
+          <mwc-button @click=${this._close}>
+            ${this.hass!.localize("ui.common.cancel")}
+          </mwc-button>
+          ${this._cardConfig !== undefined
+            ? html`
+                <mwc-button
+                  ?disabled=${!this._canSave || this._saving}
+                  @click=${this._save}
+                >
+                  ${this._saving
+                    ? html`
+                        <paper-spinner active alt="Saving"></paper-spinner>
+                      `
+                    : this.hass!.localize("ui.common.save")}
+                </mwc-button>
+              `
+            : ``}
+        </div>
       </ha-dialog>
     `;
   }
 
+  private _ignoreKeydown(ev: KeyboardEvent) {
+    ev.stopPropagation();
+  }
+
   static get styles(): CSSResultArray {
     return [
       haStyleDialog,
@@ -339,12 +347,6 @@ export class HuiDialogEditCard extends LitElement {
     this._guiModeAvailable = ev.detail.guiModeAvailable;
   }
 
-  private _handleKeyUp(ev: KeyboardEvent) {
-    if (ev.keyCode === 27) {
-      this._close();
-    }
-  }
-
   private _handleGUIModeChanged(ev: HASSDomEvent<GUIModeChangedEvent>): void {
     ev.stopPropagation();
     this._GUImode = ev.detail.guiMode;
@@ -376,6 +378,9 @@ export class HuiDialogEditCard extends LitElement {
   }
 
   private async _save(): Promise<void> {
+    if (!this._canSave || this._saving) {
+      return;
+    }
     this._saving = true;
     await this._params!.saveConfig(
       this._params!.path.length === 1