diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index a2b7475e..faa678cc 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -50,6 +50,10 @@
     cursor: text !important;
 }
 
+.ace_selection .ace_content {
+    cursor: default;
+}
+
 .ace_gutter {
     position: absolute;
     overflow : hidden;
diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js
index c7573e94..41521120 100644
--- a/lib/ace/mouse/mouse_handler.js
+++ b/lib/ace/mouse/mouse_handler.js
@@ -74,6 +74,17 @@ var MouseHandler = function(editor) {
         editor.focus();
         return event.preventDefault(e);
     });
+
+    editor.on('mousemove', function(e){
+        var char = editor.renderer.pixelToScreenCoordinates(e.x, e.y);
+        var range = editor.session.selection.getRange();
+
+        if( !range.isEmpty() && range.contains(char.row, char.column) ){
+            editor.setStyle("ace_selection");
+        }else{
+            editor.unsetStyle("ace_selection");
+        }
+    });
 };
 
 (function() {