diff --git a/common/content/commandline.js b/common/content/commandline.js
index dc532270..26a07f38 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -257,9 +257,7 @@ const CommandLine = Module("commandline", {
         });
 
         this._statusTimer = Timer(5, 100, function statusTell() {
-            if (self._completions == null)
-                return;
-            if (self._completions.selected == null)
+            if (self._completions == null || self._completions.selected == null)
                 statusline.progess = "";
             else
                 statusline.progress = "match " + (self._completions.selected + 1) + " of " + self._completions.items.length;
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 748419eb..f9b6ef13 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -383,13 +383,14 @@ const Dactyl = Module("dactyl", {
     },
 
     focus: function (elem, flags) {
+        flags = flags || services.focus.FLAG_BYMOUSE;
         try {
             if (elem instanceof Document)
                 elem = elem.defaultView;
             if (elem instanceof Window)
                 services.focus.clearFocus(elem);
             else
-                services.focus.setFocus(elem, flags || services.focus.FLAG_BYMOUSE);
+                services.focus.setFocus(elem, flags);
         } catch (e) {
             util.dump(elem);
             util.reportError(e);