diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 04dc27831b43..0043852dc400 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5811,6 +5811,10 @@ IdentityHandler.prototype = {
     // the popup is actually needed
     this._identityPopup.hidden = false;
     
+    // Tell the popup to consume dismiss clicks, to avoid bug 395314
+    this._identityPopup.popupBoxObject
+        .setConsumeRollupEvent(Ci.nsIPopupBoxObject.ROLLUP_CONSUME);
+    
     // Update the popup strings
     this.setPopupMessages(this._identityBox.className);