diff --git a/chrome/content/zotero/preferences/preferences_advanced.js b/chrome/content/zotero/preferences/preferences_advanced.js
index aa45d1f3e4..e66fce21c2 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.js
+++ b/chrome/content/zotero/preferences/preferences_advanced.js
@@ -32,8 +32,8 @@ Zotero_Preferences.Advanced = {
 	init: function () {
 		Zotero_Preferences.Keys.init();
 		
-		// Show Memory Info button if the Error Console menu option is enabled
-		if (Zotero.Prefs.get('devtools.errorconsole.enabled', true)) {
+		// Show Memory Info button
+		if (Zotero.Prefs.get('debug.memoryInfo')) {
 			document.getElementById('memory-info').hidden = false;
 		}
 		
@@ -64,6 +64,14 @@ Zotero_Preferences.Advanced = {
 	}),
 	
 	
+	onDeveloperToolsToggle: function () {
+		setTimeout(function () {
+			var enabled = Zotero.Prefs.get('devtools.chrome.enabled', true);
+			window.opener.document.getElementById('developer-menu').hidden = !enabled;
+		});
+	},
+	
+	
 	migrateDataDirectory: Zotero.Promise.coroutine(function* () {
 		var currentDir = Zotero.DataDirectory.dir;
 		var defaultDir = Zotero.DataDirectory.defaultDir;
diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
index 05ff72d9d8..3c0070a32d 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xul
+++ b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -39,6 +39,7 @@
 		<preferences>
 			<preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/>
 			<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
+			<preference id="pref-developerTools" name="devtools.chrome.enabled" type="bool"/>
 			
 			<preference id="pref-baseAttachmentPath" name="extensions.zotero.baseAttachmentPath" type="string"/>
 			<preference id="pref-useDataDir" name="extensions.zotero.useDataDir" type="bool"/>
@@ -135,6 +136,14 @@
 					<groupbox id="zotero-prefpane-advanced-advancedConfiguration">
 						<caption label="&zotero.preferences.advanced.advancedConfiguration;"/>
 						
+						<vbox>
+							<checkbox
+								label="Show developer tools"
+								preference="pref-developerTools"
+								oncommand="Zotero_Preferences.Advanced.onDeveloperToolsToggle()"
+								tooltiptext="Adds a Developer menu to the Tools menu"/>
+						</vbox>
+						
 						<hbox id="zotero-prefpane-advanced-openbuttons" align="center" style="display: block">
 							<button id="config-editor"
 								label="&zotero.preferences.configEditor;"
diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index 6b79fefda2..a734f520d3 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -48,12 +48,8 @@ const ZoteroStandalone = new function() {
 			return Zotero.initializationPromise;
 		})
 		.then(async function () {
-			if (Zotero.Prefs.get('devtools.errorconsole.enabled', true)) {
-				document.getElementById('menu_errorConsole').hidden = false;
-			}
 			if (Zotero.Prefs.get('devtools.chrome.enabled', true)) {
-				document.getElementById('menu_errorConsole').hidden = false;
-				document.getElementById('menu_runJS').hidden = false;
+				document.getElementById('developer-menu').hidden = false;
 			}
 			
 			document.getElementById('key_copyCitation')
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
index bb59a654cf..1cf6a9a79e 100644
--- a/chrome/content/zotero/standalone/standalone.xul
+++ b/chrome/content/zotero/standalone/standalone.xul
@@ -197,8 +197,14 @@
 									oncommand="ZoteroStandalone.openHelp('connectors');"/>
 							<menuitem id="menu_addons" label="&addons.label;"
 									oncommand="Zotero.openInViewer('chrome://mozapps/content/extensions/extensions.xul', ZoteroStandalone.updateAddonsPane)"/>
-							<menuitem id="menu_errorConsole" label="Error Console" oncommand="toJavaScriptConsole()" hidden="true"/>
-							<menuitem id="menu_runJS" label="Run JavaScript" oncommand="openRunJSWindow()" hidden="true"/>
+							<menu id="developer-menu"
+									label="Developer"
+									hidden="true">
+								<menupopup>
+									<menuitem id="menu_errorConsole" label="Error Console" oncommand="toJavaScriptConsole()"/>
+									<menuitem id="menu_runJS" label="Run JavaScript" oncommand="openRunJSWindow()"/>
+								</menupopup>
+							</menu>
 						</menupopup>
 					</menu>