diff --git a/ext/src/ui/popup/Popup.svelte b/ext/src/ui/popup/Popup.svelte
index 30d86e3..3155db4 100644
--- a/ext/src/ui/popup/Popup.svelte
+++ b/ext/src/ui/popup/Popup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { afterUpdate, onMount, tick } from "svelte";
+    import { afterUpdate, onDestroy, onMount, tick } from "svelte";
 
     import messaging, { Message, Port } from "../../messaging";
     import options, { Options } from "../../lib/options";
@@ -131,15 +131,15 @@
         window.addEventListener("contextmenu", onContextMenu);
         browser.menus.onClicked.addListener(onMenuClicked);
         browser.menus.onShown.addListener(onMenuShown);
+    });
 
-        return () => {
-            port?.disconnect();
-            resizeObserver.disconnect();
+    onDestroy(() => {
+        port?.disconnect();
+        resizeObserver.disconnect();
 
-            window.addEventListener("contextmenu", onContextMenu);
-            browser.menus.onClicked.removeListener(onMenuClicked);
-            browser.menus.onShown.removeListener(onMenuShown);
-        };
+        window.removeEventListener("contextmenu", onContextMenu);
+        browser.menus.onClicked.removeListener(onMenuClicked);
+        browser.menus.onShown.removeListener(onMenuShown);
     });
 
     afterUpdate(async () => {
diff --git a/ext/src/ui/popup/index.ts b/ext/src/ui/popup/index.ts
index f153280..514a448 100644
--- a/ext/src/ui/popup/index.ts
+++ b/ext/src/ui/popup/index.ts
@@ -12,5 +12,8 @@ browser.runtime.getPlatformInfo().then(platformInfo => {
 
 const target = document.getElementById("root");
 if (target) {
-    new Popup({ target });
+    const popup = new Popup({ target });
+    window.addEventListener("unload", () => {
+        popup.$destroy();
+    });
 }