diff --git a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
index e6869da6a..3f7b79bf0 100644
--- a/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
+++ b/src/zen/urlbar/ZenSiteDataPanel.sys.mjs
@@ -63,6 +63,7 @@ export class nsZenSiteDataPanel {
 
     this.#initCopyUrlButton();
     this.#initEventListeners();
+    this.#initUnifiedExtensionsManageHook();
     this.#maybeShowFeatureCallout();
   }
 
@@ -142,6 +143,16 @@ export class nsZenSiteDataPanel {
     }
   }
 
+  #initUnifiedExtensionsManageHook() {
+    const manageExtensionItem = this.document.getElementById(
+      'unified-extensions-context-menu-manage-extension'
+    );
+
+    manageExtensionItem.addEventListener('command', () => {
+      this.unifiedPanel.hidePopup();
+    });
+  }
+
   #initExtensionsPanel() {
     const panel = this.window.gUnifiedExtensions.panel;
 
@@ -584,6 +595,7 @@ export class nsZenSiteDataPanel {
       case 'zen-site-data-manage-addons': {
         const { BrowserAddonUI } = this.window;
         BrowserAddonUI.openAddonsMgr('addons://list/extension');
+        this.unifiedPanel.hidePopup();
         break;
       }
       case 'zen-site-data-settings-more': {