diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 2e6cd324..b5cd8601 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -601,7 +601,6 @@ function Commands() //{{{
             var matches = args.match(/^([^\s]+)(?:\s+(.+))?$/)
             var [lhs, rhs] = [matches[1], matches[2]];
 
-            // alert(">>" + lhs + "<<");
             if (rhs)
             {
                 vimperator.mappings.add(new Map(vimperator.modes.NORMAL, [lhs],
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 9991e018..db397409 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -310,8 +310,10 @@ function CommandLine() //{{{
         if (event.type == "blur")
         {
             // prevent losing focus, there should be a better way, but it just didn't work otherwise
-            if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
-                    setTimeout(function() { command_widget.inputField.focus(); }, 0);
+            setTimeout(function() {
+                if (vimperator.hasMode(vimperator.modes.COMMAND_LINE))
+                        command_widget.inputField.focus();
+            }, 0);
         }
         else if (event.type == "focus")
         {