From 8a819d937c58d7407dde2e8915f351647e21c9cb Mon Sep 17 00:00:00 2001
From: Jamie Woods <jamie@index.hm>
Date: Sat, 5 Oct 2024 16:10:02 +0100
Subject: [PATCH] fix for #11428

---
 .../fido2/content/fido2-page-script-delay-append.mv2.ts         | 1 +
 apps/browser/src/autofill/fido2/content/fido2-page-script.ts    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts
index 2ada31fdfe2..775bc76266d 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script-delay-append.mv2.ts
@@ -9,6 +9,7 @@
 
   const script = globalContext.document.createElement("script");
   script.src = chrome.runtime.getURL("content/fido2-page-script.js");
+  script.async = false;
 
   // We are ensuring that the script injection is delayed in the event that we are loading
   // within an iframe element. This prevents an issue with web mail clients that load content
diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
index c44c263dd23..ce28a6e7b6b 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts
@@ -4,6 +4,8 @@ import { MessageType } from "./messaging/message";
 import { Messenger } from "./messaging/messenger";
 
 (function (globalContext) {
+  document.currentScript.parentNode.removeChild(document.currentScript);
+
   const shouldExecuteContentScript =
     globalContext.document.contentType === "text/html" &&
     (globalContext.document.location.protocol === "https:" ||