diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js
index c44d03ba..a85e9672 100644
--- a/lib/ace/mouse/mouse_handler.js
+++ b/lib/ace/mouse/mouse_handler.js
@@ -128,6 +128,10 @@ var MouseHandler = function(editor) {
         this.x = ev.x;
         this.y = ev.y;
 
+        // do not move textarea during selection
+        var kt = this.editor.renderer.$keepTextAreaAtCursor;
+        this.editor.renderer.$keepTextAreaAtCursor = false;
+
         var self = this;
         var onMouseSelection = function(e) {
             self.x = e.clientX;
@@ -138,6 +142,8 @@ var MouseHandler = function(editor) {
             clearInterval(timerId);
             self[self.state + "End"] && self[self.state + "End"](e);
             self.$clickSelection = null;
+            self.editor.renderer.$keepTextAreaAtCursor = kt;
+            self.editor.renderer.$moveTextAreaToCursor();
         };
 
         var onSelectionInterval = function() {