diff --git a/chrome/content/zotero/elements/menuToolbarbutton.js b/chrome/content/zotero/elements/menuToolbarbutton.js
index 6ce3083d25..dea3ebda86 100644
--- a/chrome/content/zotero/elements/menuToolbarbutton.js
+++ b/chrome/content/zotero/elements/menuToolbarbutton.js
@@ -45,11 +45,13 @@
 					);
 					this.setAttribute('open', true);
 
-					popup.addEventListener('popuphiding', (event) => {
+					let handler = (event) => {
 						if (event.target == popup) {
 							this.setAttribute('open', false);
+							popup.removeEventListener('popuphiding', handler);
 						}
-					}, { once: true });
+					};
+					popup.addEventListener('popuphiding', handler);
 				}
 			});
 		}