--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1281,19 +1281,19 @@ var gBrowserInit = {
     if (mustLoadSidebar) {
       let sidebar = document.getElementById("sidebar");
       let sidebarBox = document.getElementById("sidebar-box");
       sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
     }
 
     UpdateUrlbarSearchSplitterState();
 
-    if (isLoadingBlank && gURLBar && isElementVisible(gURLBar))
+    if (isLoadingBlank && gURLBar)
       gURLBar.focus();
-    else
+    if (!isLoadingBlank || !gURLBar || !gURLBar.focused)
       gBrowser.selectedBrowser.focus();
 
     gNavToolbox.customizeDone = BrowserToolboxCustomizeDone;
     gNavToolbox.customizeChange = BrowserToolboxCustomizeChange;
 
     // Set up Sanitize Item
     this._initializeSanitizer();
 
@@ -1983,18 +1983,19 @@ function loadOneOrMoreURIs(aURIString)
   catch (e) {
   }
 }
 
 function focusAndSelectUrlBar() {
   if (gURLBar) {
     if (window.fullScreen)
       FullScreen.mouseoverToggle(true);
-    if (isElementVisible(gURLBar)) {
-      gURLBar.focus();
+
+    gURLBar.focus();
+    if (gURLBar.focused) {
       gURLBar.select();
       return true;
     }
   }
   return false;
 }
 
 function openLocation() {
@@ -3345,20 +3346,20 @@ const BrowserSearch = {
         Services.obs.addObserver(observer, "browser-delayed-startup-finished", false);
       }
       return;
     }
 #endif
     var searchBar = this.searchBar;
     if (searchBar && window.fullScreen)
       FullScreen.mouseoverToggle(true);
-
-    if (isElementVisible(searchBar)) {
+    if (searchBar)
+      searchBar.focus();
+    if (searchBar && searchBar.textbox.focused) {
       searchBar.select();
-      searchBar.focus();
     } else {
       openUILinkIn(Services.search.defaultEngine.searchForm, "current");
     }
   },
 
   /**
    * Loads a search results page, given a set of search terms. Uses the current
    * engine if the search bar is visible, or the default engine otherwise.