diff --git a/lib/ace/keyboard/emacs.js b/lib/ace/keyboard/emacs.js
index 93c0b2e6..b0ef90ca 100644
--- a/lib/ace/keyboard/emacs.js
+++ b/lib/ace/keyboard/emacs.js
@@ -105,14 +105,19 @@ exports.handler.attach = function(editor) {
         e.session.$selectLongWords = true;
     });
 
+    editor.renderer.screenToTextCoordinates = screenToTextBlockCoordinates;
+
     editor.setStyle("emacs-mode");
 
 };
 
 exports.handler.detach = function(editor) {
+
     delete editor.renderer.screenToTextCoordinates;
-    editor.unsetStyle("emacs-mode");
+
     editor.removeEventListener("click",$resetMarkMode);
+
+    editor.unsetStyle("emacs-mode");
 };
 
 var $resetMarkMode = function(e) {