diff --git a/js/ui/components/UploadModal.js b/js/ui/components/UploadModal.js
index 25f9fc19..6cd56475 100644
--- a/js/ui/components/UploadModal.js
+++ b/js/ui/components/UploadModal.js
@@ -476,7 +476,7 @@ export class UploadModal {
   setupAdvancedToggle(toggleButton, container, icon) {
       if (!toggleButton || !container) return;
 
-      toggleButton.addEventListener('click', () => {
+      const handleToggle = () => {
          const isHidden = container.classList.contains('hidden');
          if (isHidden) {
              container.classList.remove('hidden');
@@ -489,7 +489,10 @@ export class UploadModal {
              if (toggleButton.querySelector('span')) toggleButton.querySelector('span').textContent = "Show advanced options";
              if (icon) icon.classList.remove('rotate-90');
          }
-      });
+      };
+
+      toggleButton.addEventListener('click', handleToggle);
+      this.cleanupHandlers.push(() => toggleButton.removeEventListener('click', handleToggle));
   }
 
   buildAutoGeneratedImetaVariant(file) {