diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 146180bd12d..55583860b46 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -2056,7 +2056,8 @@ function URLBarFocusHandler(aEvent, aElt)
 
 function URLBarMouseDownHandler(aEvent, aElt)
 {
-  if (aElt.hasAttribute("focused")) {
+  if (aElt.hasAttribute("focused") ||
+      aEvent.target.id == "lock-icon" || aEvent.target.id == "feed-button") {
     gIgnoreClick = true;
   } else {
     gIgnoreFocus = true;