diff --git a/common/content/commandline.js b/common/content/commandline.js
index 51a9c8a9..5af44809 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -40,6 +40,8 @@ const CommandWidgets = Class("CommandWidgets", {
             onChange: function (elem) {
                 elem.selectionStart = elem.value.length;
                 elem.selectionEnd = elem.value.length;
+                if (!elem.collapsed)
+                    elem.focus();
             },
             onVisibility: function (elem, visible) visible && elem.focus()
         });