diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 5e2b4084a066..d0ba6ac670f4 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -186,6 +186,14 @@ var gIdentityHandler = {
   },
 
   _initializePopupListeners() {
+    let popup = this._identityPopup;
+    popup.addEventListener("popupshown", event => {
+      this.onPopupShown(event);
+    });
+    popup.addEventListener("popuphidden", event => {
+      this.onPopupHidden(event);
+    });
+
     const COMMANDS = {
       "identity-popup-security-button": () => {
         this.showSecuritySubView();
diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
index 6d00b5a1e453..768768c7d448 100644
--- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
+++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
@@ -9,8 +9,6 @@
        role="alertdialog"
        noautofocus="true"
        aria-labelledby="identity-popup-mainView-panel-header-span"
-       onpopupshown="gIdentityHandler.onPopupShown(event);"
-       onpopuphidden="gIdentityHandler.onPopupHidden(event);"
        orient="vertical">
 
   <panelmultiview id="identity-popup-multiView"