--- a/browser/modules/ContentSearch.jsm
+++ b/browser/modules/ContentSearch.jsm
@@ -407,17 +407,22 @@ this.ContentSearch = {
   },
 
   _onMessageSetCurrentEngine(msg, data) {
     Services.search.currentEngine = Services.search.getEngineByName(data);
   },
 
   _onMessageManageEngines(msg, data) {
     let browserWin = msg.target.ownerGlobal;
-    browserWin.openPreferences("paneGeneral", {origin: "contentSearch"});
+    let pref = Services.prefs.getBoolPref("browser.preferences.useOldOrganization");
+    if (pref) {
+      browserWin.openPreferences("paneSearch", {origin: "contentSearch"});
+    } else {
+      browserWin.openPreferences("general-search", {origin: "contentSearch"});
+    }
   },
 
   async _onMessageGetSuggestions(msg, data) {
     this._ensureDataHasProperties(data, [
       "engineName",
       "searchString",
     ]);
     let {engineName, searchString} = data;