diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js
index 3e1e5284..0c0da34c 100644
--- a/lib/ace/mouse/default_handlers.js
+++ b/lib/ace/mouse/default_handlers.js
@@ -47,7 +47,7 @@ function DefaultHandlers(mouseHandler) {
     editor.setDefaultHandler("quadclick", this.onQuadClick.bind(mouseHandler));
     editor.setDefaultHandler("mousewheel", this.onMouseWheel.bind(mouseHandler));
 
-    var exports = ["select", "startSelect", "selectEnd", "selectByWordsEnd",
+    var exports = ["select", "startSelect", "selectEnd", "selectAllEnd", "selectByWordsEnd",
         "selectByLinesEnd", "dragWait", "dragWaitEnd", "focusWait"];
 
     exports.forEach(function(x) {
@@ -181,6 +181,7 @@ function DefaultHandlers(mouseHandler) {
     };
 
     this.selectEnd =
+    this.selectAllEnd =
     this.selectByWordsEnd =
     this.selectByLinesEnd = function() {
         this.editor.unsetStyle("ace_selecting");
@@ -230,8 +231,7 @@ function DefaultHandlers(mouseHandler) {
 
         editor.selectAll();
         this.$clickSelection = editor.getSelectionRange();
-        this.setState("null");
-        this.selectEnd();
+        this.setState("selectAll");
     };
 
     this.onMouseWheel = function(ev) {