diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 2e9c2d5c2e00..a2ba46a269a1 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -355,7 +355,8 @@ function Startup()
     }
 
     // Focus the content area if the caller instructed us to.
-    if ("arguments" in window && window.arguments.length >= 3 && window.arguments[2] == true)
+    if ("arguments" in window && window.arguments.length >= 3 && window.arguments[2] == true ||
+        !window.locationbar.visible)
       _content.focus();
     else
       gURLBar.focus();