diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 5ddd14f2..62a4c37f 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -1800,7 +1800,7 @@ var Editor = function(renderer, session) {
 
         this.$blockScrolling += 1;
         // todo: find a way to automatically exit multiselect mode
-        this.exitMultiSelectMode && this.exitMultiSelectMode()
+        this.exitMultiSelectMode && this.exitMultiSelectMode();
         this.moveCursorTo(lineNumber - 1, column || 0);
         this.$blockScrolling -= 1;
 
diff --git a/lib/ace/multi_select.js b/lib/ace/multi_select.js
index 86fc5475..2de7fc1d 100644
--- a/lib/ace/multi_select.js
+++ b/lib/ace/multi_select.js
@@ -514,7 +514,7 @@ var Editor = require("./editor").Editor;
     * @method Editor.exitMultiSelectMode
     **/
     this.exitMultiSelectMode = function() {
-        if (this.inVirtualSelectionMode)
+        if (!this.inMultiSelectMode || this.inVirtualSelectionMode)
             return;
         this.multiSelect.toSingleRange();
     };