1 files changed, 6 insertions, 5 deletions
diff --git a/devtools/server/actors/resources/utils/parent-process-storage.js b/devtools/server/actors/resources/utils/parent-process-storage.js
index 760e6e4d38..1d3a3dd341 100644
--- a/devtools/server/actors/resources/utils/parent-process-storage.js
+++ b/devtools/server/actors/resources/utils/parent-process-storage.js
@@ -79,11 +79,12 @@ class ParentProcessStorage {
         watcherActor.sessionContext;
       await this._spawnActor(addonBrowsingContextID, addonInnerWindowId);
     } else if (watcherActor.sessionContext.type == "all") {
-      const parentProcessTargetActor =
-        this.watcherActor.getTargetActorInParentProcess();
-      const { browsingContextID, innerWindowId } =
-        parentProcessTargetActor.form();
-      await this._spawnActor(browsingContextID, innerWindowId);
+      // Note that there should be only one such target in the browser toolbox.
+      // The Parent Process Target Actor.
+      for (const targetActor of this.watcherActor.getTargetActorsInParentProcess()) {
+        const { browsingContextID, innerWindowId } = targetActor.form();
+        await this._spawnActor(browsingContextID, innerWindowId);
+      }
     } else {
       throw new Error(
         "Unsupported session context type=" + watcherActor.sessionContext.type