diff --git a/build_support/editor_textarea.html b/build_support/editor_textarea.html
index a4d4da65..351e042e 100644
--- a/build_support/editor_textarea.html
+++ b/build_support/editor_textarea.html
@@ -81,7 +81,7 @@ function inject() {
     load.scripts = {};
     window.__ace_shadowed_load__ = load;
 
-    load('ace-uncompressed.js', 'text!ace/css/editor.css', function() {
+    load('ace.js', 'text!ace/css/editor.css', function() {
         var ace = window.__ace_shadowed__;
         ace.options.mode = "javascript";
         var Event = ace.require('pilot/event');
diff --git a/lib/ace/keyboard/state_handler.js b/lib/ace/keyboard/state_handler.js
index 5861ad23..4584d3a2 100644
--- a/lib/ace/keyboard/state_handler.js
+++ b/lib/ace/keyboard/state_handler.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 // If you're developing a new keymapping and want to get an idea what's going
 // on, then enable debugging.
-var DEBUG = false;
+var DEBUG = true;
 
 function StateHandler(keymapping) {
     this.keymapping = this.$buildKeymappingRegex(keymapping);
@@ -197,7 +197,7 @@ StateHandler.prototype = {
         // If we pressed any command key but no other key, then ignore the input.
         // Otherwise "shift-" is added to the buffer, and later on "shift-g"
         // which results in "shift-shift-g" which doesn't make senese.
-        if (hashId != 0 && (key == "" || String.fromCharCode(0))) {
+        if (hashId != 0 && (key == "" || key == String.fromCharCode(0))) {
             return null;
         }