diff --git a/suite/common/tasksOverlay.xul b/suite/common/tasksOverlay.xul
index 36c59b9f927..685be74a747 100644
--- a/suite/common/tasksOverlay.xul
+++ b/suite/common/tasksOverlay.xul
@@ -20,14 +20,15 @@
 
 <keyset id="keyset">
   <key id="key_navigator" xulkey="true" key="&navigatorCmd.commandkey;" observes="Tasks:Navigator"/>
+  <key id="key_editor" xulkey="true" key="&editorCmd.commandkey;" observes="Tasks:Editor"/>
 </keyset>
 
 <broadcasterset id="broadcasterset">
   <broadcaster id="Tasks:Navigator" value="&navigatorCmd.label;" oncommand="toNavigator();"/>
+  <broadcaster id="Tasks:Editor"    value="&editorCmd.label;"    oncommand="toEditor();"/>
 </broadcasterset>
 
 
-
       <!-- Tasks Menu -->
       <menu id="tasksMenu" value="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;" datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot">
         <template>
@@ -40,7 +41,7 @@
 
         <menupopup id="taskPopup">
           <menuitem  accesskey="&navigatorCmd.accesskey;" key="key_navigator" observes="Tasks:Navigator"/>
-          <menuitem value="&editorCmd.label;"    accesskey="&editorCmd.accesskey;" oncommand="toEditor();" />
+          <menuitem  accesskey="&editorCmd.accesskey;" key="key_editor" observes="Tasks:Editor" />
           <menuseparator/>
 
           <menuitem value="&addressBookCmd.label;" accesskey="&addressBookCmd.accesskey;" oncommand="toAddressBook()"/>
diff --git a/suite/locales/en-US/chrome/common/tasksOverlay.dtd b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
index ff0af7dc74c..0628dea454a 100644
--- a/suite/locales/en-US/chrome/common/tasksOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
@@ -6,10 +6,11 @@
 <!ENTITY navigatorCmd.accesskey             "n">
 <!ENTITY navigatorCmd.commandkey            "1">
 <!-- LOCALIZATION NOTE (editorCmd.label): DONT_TRANSLATE -->
-<!ENTITY editorCmd.label					  "Composer">
+<!ENTITY editorCmd.label					"Composer">
 <!ENTITY editorCmd.accesskey				"c">
+<!ENTITY editorCmd.commandkey				"4">
 <!ENTITY addressBookCmd.label				"Address Book">  
-<!ENTITY addressBookCmd.accesskey				"a">
+<!ENTITY addressBookCmd.accesskey			"a">
 
 <!ENTITY toolsMenu.label					"Tools"> 
 <!ENTITY toolsMenu.accesskey				"t">