diff --git a/content/ui.js b/content/ui.js
index dab061e7..2cb07495 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -706,8 +706,12 @@ function CommandLine() //{{{
                 setTimeout(function () {
                     if (liberator.mode == modes.COMMAND_LINE &&
                         !(modes.extended & modes.INPUT_MULTILINE) &&
-                        !(modes.extended & modes.OUTPUT_MULTILINE))
-                                commandWidget.inputField.focus();
+                        !(modes.extended & modes.OUTPUT_MULTILINE) &&
+                        event.originalTarget == commandWidget.inputField)
+                    {
+                        commandWidget.inputField.focus();
+                        liberator.beep();
+                    }
                 }, 0);
             }
             else if (event.type == "focus")