diff --git a/toolkit/mozapps/downloads/content/downloads.xul b/toolkit/mozapps/downloads/content/downloads.xul
index e2017e99f999..55a01224ba76 100644
--- a/toolkit/mozapps/downloads/content/downloads.xul
+++ b/toolkit/mozapps/downloads/content/downloads.xul
@@ -75,8 +75,10 @@
     
   <keyset id="downloadKeys">
     <key id="key_cleanUp" keycode="VK_DELETE" command="cmd_cleanUp" modifiers="accel,shift"/>
-    <key id="key_close"   key="&cmd.close.commandKey;" oncommand="closeWindow(true);"     modifiers="accel"/>
-    <key id="key_info"    key="&cmd.info.commandKey;"  oncommand="onDownloadShowInfo();"  modifiers="accel"/>
+    <key id="key_close"   key="&cmd.close.commandKey;"  oncommand="closeWindow(true);"    modifiers="accel"/>
+    <key id="key_close2"  key="&cmd.close2.commandKey;" oncommand="closeWindow(true);"    modifiers="accel"/>
+    <key                  keycode="VK_ESCAPE"           oncommand="closeWindow(true);"/>
+    <key id="key_info"    key="&cmd.info.commandKey;"   oncommand="onDownloadShowInfo();" modifiers="accel"/>
   </keyset>
   
   <vbox id="contextMenuPalette" hidden="true">
diff --git a/toolkit/mozapps/downloads/locale/downloads.dtd b/toolkit/mozapps/downloads/locale/downloads.dtd
index fbc571aab437..e10071de2cde 100644
--- a/toolkit/mozapps/downloads/locale/downloads.dtd
+++ b/toolkit/mozapps/downloads/locale/downloads.dtd
@@ -28,6 +28,7 @@
 <!ENTITY cmd.info.commandKey              "i">
 
 <!ENTITY cmd.close.commandKey             "w">
+<!ENTITY cmd.close2.commandKey            "y">
 <!ENTITY cmd.cleanUp.label                "Clean Up">
 <!ENTITY cmd.cleanUp.tooltip              "Removes completed, canceled and failed downloads from the list">
 <!ENTITY cmd.cleanUp.accesskey            "a">