diff --git a/lib/ace/keyboard/emacs.js b/lib/ace/keyboard/emacs.js
index 6439575d..637023f1 100644
--- a/lib/ace/keyboard/emacs.js
+++ b/lib/ace/keyboard/emacs.js
@@ -445,6 +445,10 @@ exports.handler.addCommands({
     },
     killRingSave: function(editor) {
         exports.killRing.add(editor.getCopyText());
+    },
+    keyboardQuit: function(editor) {
+        editor.selection.clearSelection();
+        exports.setMarkMode(null);
     }
 });