Overlay <key>s to close, on all of our dialogs.

chrome.manifest

@@ -2,9 +2,13 @@ content    greasemonkey    content/
 skin       greasemonkey    classic/1.0 skin/
 
 overlay    chrome://browser/content/browser.xul    chrome://greasemonkey/content/browser.xul
-overlay    chrome://songbird/content/xul/mainScriptsOverlay.xul    chrome://greasemonkey/content/browser.xul
+overlay    chrome://songbird/content/xul/mainScriptsOverlay.xul chrome://greasemonkey/content/browser.xul
 overlay    chrome://mozapps/content/extensions/extensions.xul chrome://greasemonkey/content/addons.xul
 
+overlay    chrome://greasemonkey/content/install.xul chrome://greasemonkey/content/closewindow.xul
+overlay    chrome://greasemonkey/content/options.xul chrome://greasemonkey/content/closewindow.xul
+overlay    chrome://greasemonkey/content/newscript.xul chrome://greasemonkey/content/closewindow.xul
+
 style      chrome://greasemonkey/content/addons.xul    chrome://greasemonkey/skin/addons-mac.css os=Darwin
 
 locale     greasemonkey  en-US  locale/en-US/

content/closewindow.xul

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<overlay id="greasemonkey-close-window-overlay"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<commandset>
+  <command id="cmd_close" oncommand="window.close();" />
+</commandset>
+
+<keyset>
+  <key command="cmd_close" key="w" modifiers="accel" />
+  <key command="cmd_close" keycode="VK_ESCAPE" />
+</keyset>
+
+</overlay>