diff --git a/chrome/content/zotero/platformKeys.js b/chrome/content/zotero/platformKeys.js
index 0e54d49589..ee0e786ae9 100644
--- a/chrome/content/zotero/platformKeys.js
+++ b/chrome/content/zotero/platformKeys.js
@@ -4,6 +4,7 @@ window.addEventListener('DOMContentLoaded', () => {
 	let isMac = AppConstants.platform == 'macosx';
 
 	let redoKey = document.getElementById('key_redo');
+	let macUnixQuitKey = document.getElementById('key_quitApplication');
 
 	let fileQuitSeparator = document.getElementById('menu_fileQuitSeparatorNonMac');
 	let fileQuitItemWin = document.getElementById('menu_fileQuitItemWin');
@@ -22,6 +23,7 @@ window.addEventListener('DOMContentLoaded', () => {
 			redoKey.setAttribute('data-l10n-id', 'text-action-redo-shortcut');
 			redoKey.setAttribute('modifiers', 'accel');
 		}
+		if (macUnixQuitKey) macUnixQuitKey.disabled = true;
 	}
 	else {
 		// Set behavior on all non-Windows platforms
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index e91d7c4e0f..206308b6a8 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -104,6 +104,11 @@
 	
 	<keyset id="mainKeyset">
 		<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
+		<key id="key_quitApplication"
+			key="&quitApplicationCmdMac.key;"
+			command="cmd_quitApplication"
+			modifiers="accel"
+			internal="true"/>
 		<key id="key_import"
 				key="&importCmd.key;"
 				command="cmd_zotero_import"
@@ -576,11 +581,6 @@
 								oncommand="ZoteroStandalone.openHelp();"
 								key="&helpMac.commandkey;"
 								modifiers="accel"/>
-						<key id="key_quitApplication"
-								key="&quitApplicationCmdMac.key;"
-								command="cmd_quitApplication"
-								modifiers="accel"
-								internal="true"/>
 					</keyset>
 					
 					<menu id="windowMenu"