diff --git a/mozilla/mail/base/content/ABSearchDialog.xul b/mozilla/mail/base/content/ABSearchDialog.xul
index e0607654459..3af11354e57 100644
--- a/mozilla/mail/base/content/ABSearchDialog.xul
+++ b/mozilla/mail/base/content/ABSearchDialog.xul
@@ -64,6 +64,7 @@
   <broadcaster id="Communicator:WorkMode"/>
 
   <keyset id="mailKeys">
+    <key key="&closeCmd.key;" modifiers="accel" oncommand="onSearchStop(); closeWindow(true);"/>
     <key keycode="VK_ESCAPE" xulkey="false" oncommand="onSearchStop(); closeWindow(true);"/>
   </keyset>
 
diff --git a/mozilla/mail/base/content/FilterListDialog.xul b/mozilla/mail/base/content/FilterListDialog.xul
index 73adfa1146c..397394ad201 100644
--- a/mozilla/mail/base/content/FilterListDialog.xul
+++ b/mozilla/mail/base/content/FilterListDialog.xul
@@ -46,6 +46,7 @@
   <keyset id="dialogKeys"/>
 
   <keyset>
+    <key key="&closeCmd.key;" modifiers="accel" oncommand="onFilterClose();"/>
     <key keycode="VK_ESCAPE" xulkey="false" oncommand="onFilterClose();"/>
   </keyset>
 
diff --git a/mozilla/mail/base/content/SearchDialog.xul b/mozilla/mail/base/content/SearchDialog.xul
index 4389ca9a9ae..381db66753f 100644
--- a/mozilla/mail/base/content/SearchDialog.xul
+++ b/mozilla/mail/base/content/SearchDialog.xul
@@ -68,6 +68,7 @@
 
   <keyset id="mailKeys">
     <key id="key_delete" oncommand="goDoCommand('cmd_delete');"/>
+    <key key="&closeCmd.key;" modifiers="accel" oncommand="onSearchStop(); closeWindow(true);"/>
     <key keycode="VK_ESCAPE" xulkey="false" oncommand="onSearchStop(); closeWindow(true);"/>
 #ifdef XP_MACOSX
     <key id="cmd_shiftDelete" keycode="VK_BACK" xulkey="false" oncommand="goDoCommand('cmd_shiftDelete');" modifiers="shift"/>
diff --git a/mozilla/mail/locales/en-US/chrome/messenger/SearchDialog.dtd b/mozilla/mail/locales/en-US/chrome/messenger/SearchDialog.dtd
index 7982ebde494..3f351980f07 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/SearchDialog.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/SearchDialog.dtd
@@ -21,6 +21,7 @@
 <!ENTITY fileHereMenu.accesskey      "F">
 <!ENTITY fileButton.label            "File">
 <!ENTITY fileButton.accesskey        "i">
+<!ENTITY closeCmd.key                "W"> 
 <!ENTITY goToFolderButton.label      "Open Message Folder">
 <!ENTITY goToFolderButton.accesskey  "r">
 <!ENTITY saveAsVFButton.label      "Save as Virtual Folder">
diff --git a/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd b/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
index d28491fab44..1c7d74cf495 100644
--- a/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
+++ b/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
@@ -26,3 +26,4 @@
 <!ENTITY choosethisnewsserver.label "choose this news server">
 <!ENTITY helpButton.label "Help">
 <!ENTITY helpButton.accesskey "H">
+<!ENTITY closeCmd.key "W">