diff --git a/common/bootstrap.js b/common/bootstrap.js
index 2b5d6402..4ce89386 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -147,13 +147,14 @@ function init() {
         }
     }
 
-    Services.obs.notifyObservers(null, "dactyl-rehash", null);
-
     JSMLoader.load("resource://dactyl/base.jsm", global);
 
     for each (let component in components)
         component.register();
 
+    Services.obs.notifyObservers(null, "dactyl-rehash", null);
+    JSMLoader.load("resource://dactyl/base.jsm", global);
+
     require(global, "services");
 
     let manifestText = result.map(function (line) line.join(" ")).join("\n");
diff --git a/common/content/commandline.js b/common/content/commandline.js
index fa656d09..873ac941 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -935,10 +935,11 @@ var CommandLine = Module("commandline", {
             }
             else if (event.type == "keypress") {
                 let key = events.toString(event);
+                util.dump("keypress", key, Events.isEscape(event));
                 if (this._completions)
                     this._completions.previewClear();
                 if (!this.currentExtendedMode)
-                    return;
+                    return !Events.isEscape(event);
 
                 // user pressed <Enter> to carry out a command
                 // user pressing <Esc> is handled in the global onEscape
@@ -977,10 +978,8 @@ var CommandLine = Module("commandline", {
                         modes.pop();
                     }
                 }
-                else {
-                    //this.resetCompletions();
-                }
                 // allow this event to be handled by the host app
+                return !Events.isEscape(event);
             }
             else if (event.type == "keyup") {
                 let key = events.toString(event);
@@ -991,9 +990,7 @@ var CommandLine = Module("commandline", {
         catch (e) {
             dactyl.reportError(e, true);
         }
-        finally {
-            return true;
-        }
+        return true;
     },
 
     /**