From b4cc133a6e5f7dab190bcb4f51f16824007996a0 Mon Sep 17 00:00:00 2001
From: Cesar Gonzalez <cgonzalez@bitwarden.com>
Date: Wed, 19 Jun 2024 04:00:17 -0500
Subject: [PATCH] [PM-5189] Working through content script port improvement

---
 .../autofill/services/autofill-overlay-content.service.ts    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
index a0dfc5ce85b..c5f58cbf769 100644
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
@@ -1147,6 +1147,11 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
       this.handleVisibilityChangeEvent,
     );
     globalThis.removeEventListener(EVENTS.FOCUSOUT, this.handleFormFieldBlurEvent);
+    globalThis.removeEventListener(EVENTS.FOCUS, this.handleSubFrameFocusInEvent);
+    globalThis.document.body.removeEventListener(
+      EVENTS.MOUSEENTER,
+      this.handleSubFrameFocusInEvent,
+    );
     this.removeOverlayRepositionEventListeners();
   }
 }