diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js
index f755270c..2da72d31 100644
--- a/lib/ace/mouse/mouse_handler.js
+++ b/lib/ace/mouse/mouse_handler.js
@@ -76,14 +76,14 @@ var MouseHandler = function(editor) {
         return event.preventDefault(e);
     });
 
-    editor.on('mousemove', function(e){
-        if (_self.state)
+    editor.on("mousemove", function(e){
+        if (_self.state || _self.$dragDelay || !_self.$dragEnabled)
             return;
         
         var char = editor.renderer.screenToTextCoordinates(e.x, e.y);
         var range = editor.session.selection.getRange();
-		var renderer = editor.renderer;
-		
+        var renderer = editor.renderer;
+
         if (!range.isEmpty() && range.insideStart(char.row, char.column)) {
             renderer.setCursorStyle("default");
         } else {