diff --git a/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd b/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
index ff9b9dff9cb..a9a761b26dc 100644
--- a/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
+++ b/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
@@ -116,8 +116,8 @@
 
 <!ENTITY calendar.quit.label                    "Quit">
 <!ENTITY calendar.quit.accesskey                "Q">
+<!ENTITY calendar.quit.key                      "Q">
 <!ENTITY calendar.quit.label.mac                "Quit &brandShortName;">
-<!ENTITY calendar.quit.key.mac                  "Q">
 <!ENTITY calendar.quit.modifiers.mac            "accel">
 
 <!ENTITY calendar.exit.label                    "Exit">
diff --git a/calendar/sunbird/base/content/calendar-menubar.inc b/calendar/sunbird/base/content/calendar-menubar.inc
index 0876729d465..265a8e7b1b1 100644
--- a/calendar/sunbird/base/content/calendar-menubar.inc
+++ b/calendar/sunbird/base/content/calendar-menubar.inc
@@ -123,8 +123,8 @@
 #ifdef XP_MACOSX
            <menuitem id="menu_FileQuitItem"
                      label="&calendar.quit.label.mac;"
-                     key="key_quitCmdMac"
-                     oncommand="goQuitApplication()"/>
+                     key="key_quitApplication"
+                     command="cmd_quitApplication"/>
 #else
            <menuseparator id="calendar-print-sep"/>
 #ifdef XP_WIN
@@ -136,7 +136,8 @@
            <menuitem id="calendar-quit-menu"
                      label="&calendar.quit.label;"
                      accesskey="&calendar.quit.accesskey;"
-                     oncommand="goQuitApplication()"/>
+                     key="key_quitApplication"
+                     command="cmd_quitApplication"/>
 #endif
 #endif
          </menupopup>
diff --git a/calendar/sunbird/base/content/calendar-sets.inc b/calendar/sunbird/base/content/calendar-sets.inc
index 4cd7cab1f60..d33567c81d9 100644
--- a/calendar/sunbird/base/content/calendar-sets.inc
+++ b/calendar/sunbird/base/content/calendar-sets.inc
@@ -70,7 +70,8 @@
   <command id="open_local_calendar_command" oncommand="openLocalCalendar()"/>
 
   <command id="go_date_command" oncommand="gCalendarWindow.pickAndGoToDate()"/>
-
+  <command id="cmd_quitApplication"     oncommand="goQuitApplication()"/>
+	
   <command id="close_calendar_command" oncommand="closeCalendar()"/>
 
 #ifdef XP_MACOSX
@@ -119,10 +120,12 @@
 #ifdef XP_MACOSX
   <key id="key_minimizeWindow"   key="&minimizeWindow.key;"              command="minimizeWindow"               modifiers="accel"/>
   <key id="key_preferencesCmdMac" key="&preferencesCmdMac.commandkey;" modifiers="&preferencesCmdMac.modifiers;"/>
-  <key id="key_quitCmdMac" key="&calendar.quit.key.mac;" modifiers="&calendar.quit.modifiers.mac;"/>
   <key id="key_hideThisAppCmdMac" key="&hideThisAppCmdMac.commandkey;" modifiers="&hideThisAppCmdMac.modifiers;"/>
   <key id="key_hideOtherAppsCmdMac" key="&hideOtherAppsCmdMac.commandkey;" modifiers="&hideOtherAppsCmdMac.modifiers;"/>
 #endif
+#ifdef XP_UNIX
+  <key id="key_quitApplication" key="&calendar.quit.key;" command="cmd_quitApplication" modifiers="accel"/>
+#endif
 </keyset>
 
 <keyset id="tasksKeys"/>