diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index c8bec5f41cea..11c11b293ee5 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -273,9 +273,13 @@
                  oninput="URLBarOnInput(event);"
                  ontextentered="return handleURLBarCommand(param);"
                  ontextreverted="return handleURLBarRevert();"
-                 pageproxystate="invalid">
+                 pageproxystate="invalid"
+                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+                 onblur="document.getElementById('identity-box').style.MozUserFocus = 'ignore';">
           <!-- Use onclick instead of normal popup= syntax since the popup
-               code fires onmousedown, and hence eats our favicon drag events -->
+               code fires onmousedown, and hence eats our favicon drag events.
+               We only add the identity-box button to the tab order when the location bar
+               has focus, otherwise pressing F6 focuses it instead of the location bar -->
           <box id="identity-box" role="button"
                onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
                onkeypress="getIdentityHandler().handleIdentityButtonEvent(event);">
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 6ae10590a594..7f2c187ff4ff 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -821,7 +821,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
 #identity-box {
   background-color: -moz-dialog;
   -moz-border-end: 1px solid ThreeDShadow;
-  -moz-user-focus: normal;
 }
 
 #identity-box:focus {
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 0d18ace42e72..eb9ad4e70308 100755
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -1308,7 +1308,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #identity-box {
   background: url("chrome://browser/skin/urlbar/startcap.png") left center no-repeat;
   min-width: 42px;
-  -moz-user-focus: normal;
 }
 
 #identity-box:focus {
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index e32f254dea33..0e16beaa2a99 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1710,7 +1710,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   /* currently, the identity box is always LTR */
   -moz-outline-radius-topleft: 2px;
   -moz-outline-radius-bottomleft: 2px;
-  -moz-user-focus: normal;
 }
 
 #identity-box:focus {