diff --git a/app/assets/javascripts/discourse/views/modal.js.es6 b/app/assets/javascripts/discourse/views/modal.js.es6
index 4283466f7e3..04f086afbcb 100644
--- a/app/assets/javascripts/discourse/views/modal.js.es6
+++ b/app/assets/javascripts/discourse/views/modal.js.es6
@@ -12,5 +12,12 @@ export default Ember.View.extend({
       // the backdrop and makes it unclickable.
       $('.modal-header a.close').click();
     }
+  },
+
+  keyDown(e) {
+    // Delegate click to modal close when pressing ESC
+    if (e.which === 27) {
+      Em.run.next(() => $('.modal-header a.close').click());
+    }
   }
 });