--- a/calendar/base/content/calendar-common-sets.xul
+++ b/calendar/base/content/calendar-common-sets.xul
@@ -154,17 +154,17 @@
          observes="calendar_week-view_command"
 #expand  modifiers="__CAL_VIEW_MODIFIERS__"/>
     <key id="calendar-multiweek-view-key" key="3"
          observes="calendar_multiweek-view_command"
 #expand  modifiers="__CAL_VIEW_MODIFIERS__"/>
     <key id="calendar-month-view-key" key="4"
          observes="calendar_month-view_command"
 #expand  modifiers="__CAL_VIEW_MODIFIERS__"/>
-    <key id="calendar-go-to-today-key" keycode="VK_DOWN" observes="calendar_go_to_today_command" modifiers="accel"/>
+    <key id="calendar-go-to-today-key" keycode="VK_END" observes="calendar_go_to_today_command" modifiers="alt"/>
     <key id="calendar-delete-item-key" keycode="VK_DELETE" observes="calendar_delete_event_command"/>
     <key id="calendar-delete-todo-key" keycode="VK_DELETE" observes="calendar_delete_todo_command"/>
   </keyset>
 
   <popupset id="calendar-popupset">
     <!-- Tooltips -->
     <tooltip id="eventTreeTooltip"
              onpopupshowing="return showToolTip(this, unifinderTreeView.getItemFromEvent(event))"

--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -459,16 +459,17 @@
                oncommand="document.getElementById('tabmail').openTab('calendar', { title: document.getElementById('calendar-tab-button').getAttribute('tooltiptext') })"/>
       <command id="switch2task"
                oncommand="document.getElementById('tabmail').openTab('tasks', { title: document.getElementById('task-tab-button').getAttribute('tooltiptext') })"/>
       <command id="new_calendar_tab"
                oncommand="document.getElementById('tabmail').openTab('calendar', { title: document.getElementById('calendar-tab-button').getAttribute('tooltiptext') })"/>
       <command id="new_task_tab"
                oncommand="document.getElementById('tabmail').openTab('tasks', { title: document.getElementById('task-tab-button').getAttribute('tooltiptext') })"/>
       <command id="calendar_go_to_today_command"
+               observes="calendar_mode_calendar"
                oncommand="document.getElementById('tabmail').openTab('calendar', { title: document.getElementById('calendar-tab-button').getAttribute('tooltiptext') }); goToDate(now())"/>
     </commandset>
 
     <keyset id="calendar-keys">
       <key id="openLightningKey"
            key="&lightning.keys.event.showCalendar.key;"
            modifiers="accel, shift"
            observes="new_calendar_tab"/>