diff --git a/devtools/client/aboutdebugging/src/modules/extensions-helper.js b/devtools/client/aboutdebugging/src/modules/extensions-helper.js
index ec0d7c26617d..cf6c7641e910 100644
--- a/devtools/client/aboutdebugging/src/modules/extensions-helper.js
+++ b/devtools/client/aboutdebugging/src/modules/extensions-helper.js
@@ -51,7 +51,7 @@ exports.getExtensionUuid = function (extension) {
 exports.openTemporaryExtension = function (win, message) {
   return new Promise(resolve => {
     const fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(win, message, Ci.nsIFilePicker.modeOpen);
+    fp.init(win.browsingContext, message, Ci.nsIFilePicker.modeOpen);
 
     // Try to set the last directory used as "displayDirectory".
     try {
diff --git a/devtools/client/memory/utils.js b/devtools/client/memory/utils.js
index 5d9766381072..c16da9c14ad2 100644
--- a/devtools/client/memory/utils.js
+++ b/devtools/client/memory/utils.js
@@ -434,7 +434,7 @@ exports.openFilePicker = function ({ title, filters, defaultName, mode }) {
   }
 
   const fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-  fp.init(window, title, fpMode);
+  fp.init(window.browsingContext, title, fpMode);
 
   for (const filter of filters || []) {
     fp.appendFilter(filter[0], filter[1]);
diff --git a/devtools/client/netmonitor/src/har/har-menu-utils.js b/devtools/client/netmonitor/src/har/har-menu-utils.js
index 756d9d9f96ea..7fb9f7aee729 100644
--- a/devtools/client/netmonitor/src/har/har-menu-utils.js
+++ b/devtools/client/netmonitor/src/har/har-menu-utils.js
@@ -57,7 +57,7 @@ var HarMenuUtils = {
   openHarFile(actions, openSplitConsole) {
     const fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     fp.init(
-      window,
+      window.browsingContext,
       L10N.getStr("netmonitor.har.importHarDialogTitle"),
       Ci.nsIFilePicker.modeOpen
     );
diff --git a/devtools/client/performance-new/shared/browser.js b/devtools/client/performance-new/shared/browser.js
index c97bb0a0ab90..9939789c873b 100644
--- a/devtools/client/performance-new/shared/browser.js
+++ b/devtools/client/performance-new/shared/browser.js
@@ -153,7 +153,12 @@ function openFilePickerForObjdir(window, objdirs, changeObjdirs) {
   const FilePicker = Cc["@mozilla.org/filepicker;1"].createInstance(
     Ci.nsIFilePicker
   );
-  FilePicker.init(window, "Pick build directory", FilePicker.modeGetFolder);
+  FilePicker.init(
+    // @ts-ignore
+    window.browsingContext,
+    "Pick build directory",
+    FilePicker.modeGetFolder
+  );
   FilePicker.open(rv => {
     if (rv == FilePicker.returnOK) {
       const path = FilePicker.file.path;
diff --git a/devtools/client/styleeditor/StyleEditorUtil.sys.mjs b/devtools/client/styleeditor/StyleEditorUtil.sys.mjs
index 7cce0a514951..11dae675d9ab 100644
--- a/devtools/client/styleeditor/StyleEditorUtil.sys.mjs
+++ b/devtools/client/styleeditor/StyleEditorUtil.sys.mjs
@@ -142,7 +142,7 @@ export function showFilePicker(
     fp.defaultString = suggestedFilename;
   }
 
-  fp.init(parentWindow, getString(key + ".title"), mode);
+  fp.init(parentWindow.browsingContext, getString(key + ".title"), mode);
   fp.appendFilter(getString(key + ".filter"), "*.css");
   fp.appendFilters(fp.filterAll);
   fp.open(fpCallback);
diff --git a/devtools/client/webconsole/components/Input/JSTerm.js b/devtools/client/webconsole/components/Input/JSTerm.js
index f00ddd66b00d..cf29690c7512 100644
--- a/devtools/client/webconsole/components/Input/JSTerm.js
+++ b/devtools/client/webconsole/components/Input/JSTerm.js
@@ -758,7 +758,7 @@ class JSTerm extends Component {
   async _openFile() {
     const fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     fp.init(
-      this.webConsoleUI.document.defaultView,
+      this.webConsoleUI.document.defaultView.browsingContext,
       l10n.getStr("webconsole.input.openJavaScriptFile"),
       Ci.nsIFilePicker.modeOpen
     );
diff --git a/devtools/shared/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js
index e3ea0ea5284e..9a38e4eed577 100644
--- a/devtools/shared/DevToolsUtils.js
+++ b/devtools/shared/DevToolsUtils.js
@@ -901,7 +901,7 @@ exports.showSaveFileDialog = function (
     fp.defaultString = suggestedFilename;
   }
 
-  fp.init(parentWindow, null, fp.modeSave);
+  fp.init(parentWindow.browsingContext, null, fp.modeSave);
   if (Array.isArray(filters) && filters.length) {
     for (const { pattern, label } of filters) {
       fp.appendFilter(label, pattern);