diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
index 90c698c5990..788f3ad823e 100644
--- a/apps/browser/src/autofill/services/collect-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
@@ -1100,6 +1100,7 @@ export class CollectAutofillContentService implements CollectAutofillContentServ
       this.autofillOverlayContentService.pageDetailsUpdateRequired = true;
     }
     this.noFieldsFound = false;
+    this.updateAutofillElementsAfterMutation();
   };
 
   /**
diff --git a/apps/browser/src/autofill/services/dom-query.service.ts b/apps/browser/src/autofill/services/dom-query.service.ts
index b20f33f02f8..177a0122edf 100644
--- a/apps/browser/src/autofill/services/dom-query.service.ts
+++ b/apps/browser/src/autofill/services/dom-query.service.ts
@@ -104,7 +104,12 @@ export class DomQueryService implements DomQueryServiceInterface {
    * @returns True if any new shadow roots are found that aren't being observed
    */
   checkForNewShadowRoots = (): boolean => {
-    const currentRoots = this.queryShadowRoots(globalThis.document.body);
+    let currentRoots: ShadowRoot[];
+    try {
+      currentRoots = this.recursivelyQueryShadowRoots(globalThis.document.body);
+    } catch {
+      currentRoots = this.queryShadowRoots(globalThis.document.body);
+    }
 
     for (const root of currentRoots) {
       if (!this.observedShadowRoots.has(root)) {