diff --git a/app/internal_packages/composer/keymaps/composer.json b/app/internal_packages/composer/keymaps/composer.json
index 430d8cff8..cb5e2158a 100644
--- a/app/internal_packages/composer/keymaps/composer.json
+++ b/app/internal_packages/composer/keymaps/composer.json
@@ -5,5 +5,5 @@
   "composer:show-and-focus-from": "mod+shift+f",
   "composer:send-message": "mod+enter",
   "composer:no-op": "del",
-  "composer:delete-empty-draft": "escape"
+  "composer:delete-empty-draft": "mod+escape"
 }
diff --git a/app/internal_packages/composer/lib/composer-view.tsx b/app/internal_packages/composer/lib/composer-view.tsx
index dbd8b4a25..f47ae9607 100644
--- a/app/internal_packages/composer/lib/composer-view.tsx
+++ b/app/internal_packages/composer/lib/composer-view.tsx
@@ -66,12 +66,15 @@ export default class ComposerView extends React.Component<ComposerViewProps, Com
 
   _keymapHandlers = {
     'composer:send-message': () => this.sendButton.current.primarySend(),
-    'composer:delete-empty-draft': () => this.props.draft.pristine && this._onDestroyDraft(),
     'composer:show-and-focus-bcc': () => this.header.current.showAndFocusField(Fields.Bcc),
     'composer:show-and-focus-cc': () => this.header.current.showAndFocusField(Fields.Cc),
     'composer:focus-to': () => this.header.current.showAndFocusField(Fields.To),
     'composer:show-and-focus-from': () => {},
     'composer:select-attachment': () => this._onSelectAttachment(),
+    'composer:delete-empty-draft': (e: Event) => {
+      this.props.draft.pristine && this._onDestroyDraft();
+      e.preventDefault();
+    },
   };
 
   constructor(props) {