diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 5c30fdce29..f89fd337b5 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -312,7 +312,9 @@
                  onfocus="URLBarFocusHandler(event);"
                  onmousedown="URLBarMouseDownHandler(event);"
                  onclick="URLBarClickHandler(event);">
-          <box id="notification-popup-box" hidden="true" align="center">
+          <box id="notification-popup-box" hidden="true" align="center"
+               onmousedown="event.stopPropagation();"
+               onclick="event.stopPropagation();">
             <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
             <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
             <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -330,8 +332,9 @@
                    onerror="gBrowser.addToMissedIconCache(this.src);"
                    tooltiptext="&proxyIcon.tooltip;"/>
           </deck>
-          <hbox id="urlbar-icons"
-                class="urlbar-icons">
+          <hbox id="urlbar-icons" class="urlbar-icons"
+                onmousedown="event.stopPropagation();"
+                onclick="event.stopPropagation();">
             <image id="feedsButton" hidden="true" popup="feedsPopup"/>
             <image id="ev-button" hidden="true"
                    onclick="if (event.button == 0) BrowserPageInfo(null, 'securityTab');"/>
diff --git a/suite/common/bookmarks/browser-places.js b/suite/common/bookmarks/browser-places.js
index 16052b9a24..6a05d6c9c0 100644
--- a/suite/common/bookmarks/browser-places.js
+++ b/suite/common/bookmarks/browser-places.js
@@ -750,9 +750,6 @@ var PlacesStarButton = {
   onClick: function PSB_onClick(aEvent) {
     if (aEvent.button == 0)
       PlacesCommandHook.bookmarkCurrentPage(this._starred);
-
-    // don't bubble to the textbox so that the address won't be selected
-    aEvent.stopPropagation();
   },
 
   // nsINavBookmarkObserver