diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 8c6f397d..3aa1fac0 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -735,11 +735,14 @@ function Events() //{{{
             vimperator.input.pendingArgMap = null;
             vimperator.input.pendingMotionMap = null;
 
-            stop = false; // command was not a vimperator command, maybe it is a firefox command
+            if (key != "<Esc>" && key != "<C-[>")
+            {
+                stop = false; // command was not a vimperator command, maybe it is a firefox command
 
-            // TODO: see if this check is needed or are all motion commands already mapped in these modes?
-            if (vimperator.mode != vimperator.modes.INSERT && vimperator.mode != vimperator.modes.COMMAND_LINE)
-                vimperator.beep();
+                // TODO: see if this check is needed or are all motion commands already mapped in these modes?
+                if (vimperator.mode != vimperator.modes.INSERT && vimperator.mode != vimperator.modes.COMMAND_LINE)
+                    vimperator.beep();
+            }
         }
 
         if (stop)
diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js
index c67b40bd..de1a51db 100644
--- a/chrome/content/vimperator/mappings.js
+++ b/chrome/content/vimperator/mappings.js
@@ -306,7 +306,7 @@ function Mappings() //{{{
                    vimperator.modes.INSERT,
                    vimperator.modes.VISUAL,
                    vimperator.modes.HINTS,
-                   //vimperator.modes.COMMAND_LINE,
+                   vimperator.modes.COMMAND_LINE,
                    vimperator.modes.CARET,
                    vimperator.modes.TEXTAREA];
     var any_non_insertmode = [vimperator.modes.NORMAL,
@@ -1295,13 +1295,6 @@ function Mappings() //{{{
             always_active: true
         }
     ));
-    /*addDefaultMap(new Map([vimperator.modes.HINTS], ["<Esc>", "<C-[>", "<C-c>"],
-        function() { ; },
-        {
-            cancel_mode: true,
-            always_active: true
-        }
-    ));*/
     
     // }}}
     // Caret mode
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 99cec0fb..86de71f4 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -386,7 +386,6 @@ function CommandLine() //{{{
                 var mode = cur_extended_mode; // save it here, as setMode() resets it
                 history.add(command);
                 vimperator.modes.reset(true); //FIXME: use mode stack
-                //vimperator.focusContent();
                 completionlist.hide();
                 vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
                 return vimperator.triggerCallback("submit", mode, command);
@@ -398,7 +397,6 @@ function CommandLine() //{{{
                 var res = vimperator.triggerCallback("cancel", cur_extended_mode);
                 history.add(command);
                 vimperator.modes.set(old_mode, old_extended_mode);
-                //vimperator.focusContent();
                 completionlist.hide();
                 vimperator.statusline.updateProgress(""); // we may have a "match x of y" visible
                 this.clear();
@@ -433,6 +431,7 @@ function CommandLine() //{{{
                     if (history_index == lines.length)
                     {
                         setCommand(history_start);
+                        vimperator.triggerCallback("change", cur_extended_mode, this.getCommand());
                         return;
                     }
 
@@ -453,6 +452,7 @@ function CommandLine() //{{{
                     if (lines[history_index].indexOf(history_start) == 0)
                     {
                         setCommand(lines[history_index]);
+                        vimperator.triggerCallback("change", cur_extended_mode, this.getCommand());
                         return;
                     }
                 }