1 files changed, 24 insertions, 13 deletions
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index ae9c1d0a9a..5967c878b3 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -431,8 +431,7 @@ async function openPreferences(paneID, extraArgs) {
       }
     }
   }
-  let preferencesURL =
-    "about:preferences" +
+  let preferencesURLSuffix =
     (params ? "?" + params : "") +
     (friendlyCategoryName ? "#" + friendlyCategoryName : "");
   let newLoad = true;
@@ -444,7 +443,7 @@ async function openPreferences(paneID, extraArgs) {
     let supportsStringPrefURL = Cc[
       "@mozilla.org/supports-string;1"
     ].createInstance(Ci.nsISupportsString);
-    supportsStringPrefURL.data = preferencesURL;
+    supportsStringPrefURL.data = "about:preferences" + preferencesURLSuffix;
     windowArguments.appendElement(supportsStringPrefURL);
 
     win = Services.ww.openWindow(
@@ -458,11 +457,28 @@ async function openPreferences(paneID, extraArgs) {
     let shouldReplaceFragment = friendlyCategoryName
       ? "whenComparingAndReplace"
       : "whenComparing";
-    newLoad = !win.switchToTabHavingURI(preferencesURL, true, {
-      ignoreFragment: shouldReplaceFragment,
-      replaceQueryString: true,
-      triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
-    });
+    newLoad = !win.switchToTabHavingURI(
+      "about:settings" + preferencesURLSuffix,
+      false,
+      {
+        ignoreFragment: shouldReplaceFragment,
+        replaceQueryString: true,
+        triggeringPrincipal:
+          Services.scriptSecurityManager.getSystemPrincipal(),
+      }
+    );
+    if (newLoad) {
+      newLoad = !win.switchToTabHavingURI(
+        "about:preferences" + preferencesURLSuffix,
+        true,
+        {
+          ignoreFragment: shouldReplaceFragment,
+          replaceQueryString: true,
+          triggeringPrincipal:
+            Services.scriptSecurityManager.getSystemPrincipal(),
+        }
+      );
+    }
     browser = win.gBrowser.selectedBrowser;
   }
 
@@ -533,11 +549,6 @@ function buildHelpMenu() {
   if (typeof gSafeBrowsing != "undefined") {
     gSafeBrowsing.setReportPhishingMenu();
   }
-
-  if (NimbusFeatures.deviceMigration.getVariable("helpMenuHidden")) {
-    let helpMenuItem = document.getElementById("helpSwitchDevice");
-    helpMenuItem.hidden = true;
-  }
 }
 
 function isElementVisible(aElement) {