Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/browser/actors/PromptParent.sys.mjs b/browser/actors/PromptParent.sys.mjs
index 1407e06a75..4a159cbda5 100644
--- a/browser/actors/PromptParent.sys.mjs
+++ b/browser/actors/PromptParent.sys.mjs
@@ -140,8 +140,7 @@ export class PromptParent extends JSWindowActorParent {
           (args.modalType === Ci.nsIPrompt.MODAL_TYPE_CONTENT &&
             !lazy.contentPromptSubDialog) ||
           (args.modalType === Ci.nsIPrompt.MODAL_TYPE_TAB &&
-            !lazy.tabChromePromptSubDialog) ||
-          this.isAboutAddonsOptionsPage(this.browsingContext)
+            !lazy.tabChromePromptSubDialog)
         ) {
           return this.openContentPrompt(args, id);
         }
@@ -262,6 +261,11 @@ export class PromptParent extends JSWindowActorParent {
     let browsingContext = this.browsingContext.top;
 
     let browser = browsingContext.embedderElement;
+
+    if (this.isAboutAddonsOptionsPage(browsingContext)) {
+      browser = browser.ownerGlobal.browsingContext.embedderElement;
+    }
+
     let promptRequiresBrowser =
       args.modalType === Services.prompt.MODAL_TYPE_TAB ||
       args.modalType === Services.prompt.MODAL_TYPE_CONTENT;