diff --git a/apps/extension/content/ContentApp.tsx b/apps/extension/content/ContentApp.tsx
index a8740f25..e674137a 100644
--- a/apps/extension/content/ContentApp.tsx
+++ b/apps/extension/content/ContentApp.tsx
@@ -146,8 +146,10 @@ export default function ContentApp({
 
 		return () => {
 			document.removeEventListener("mousemove", () => {});
+			document.removeEventListener('keydown', handleKeyDown, true);
+
 		};
-	}, []);
+	}, [isPopoverOpen]);
 
 	const getSpaces = async () => {
 		const response = await fetch(`${BACKEND_URL}/api/spaces`, {