diff --git a/chrome/content/scaffold/scaffold.xul b/chrome/content/scaffold/scaffold.xul
index c798c7d47b..6daf6a19c3 100644
--- a/chrome/content/scaffold/scaffold.xul
+++ b/chrome/content/scaffold/scaffold.xul
@@ -258,4 +258,8 @@
 		</hbox>
 
 	</vbox>
+	
+	<keyset>
+		<key id="key_close" key="W" modifiers="accel" oncommand="window.close()"/>
+	</keyset>
 </window>
diff --git a/chrome/content/zotero/runJS.js b/chrome/content/zotero/runJS.js
index ea621115c4..0a9703e0e4 100644
--- a/chrome/content/zotero/runJS.js
+++ b/chrome/content/zotero/runJS.js
@@ -68,6 +68,9 @@ window.addEventListener('keypress', function (event) {
 		run();
 		event.stopPropagation();
 	}
+	else if (event.key == 'w') {
+		window.close();
+	}
 });
 
 var shortcut = Zotero.isMac ? 'Cmd-R' : 'Ctrl+R';
diff --git a/chrome/content/zotero/tools/csledit.xul b/chrome/content/zotero/tools/csledit.xul
index 78316b62ad..bb08bca9a4 100644
--- a/chrome/content/zotero/tools/csledit.xul
+++ b/chrome/content/zotero/tools/csledit.xul
@@ -73,4 +73,7 @@
 		<iframe id="zotero-csl-preview-box" flex="1" style="padding: 0 1em;background:white" overflow="auto" type="content"/>
 	</vbox>
 	
+	<keyset>
+		<key id="key_close" key="W" modifiers="accel" oncommand="window.close()"/>
+	</keyset>
 </window>