diff --git a/src/client/application/application-controller.vala b/src/client/application/application-controller.vala
index ecc52ace..e3a2204f 100644
--- a/src/client/application/application-controller.vala
+++ b/src/client/application/application-controller.vala
@@ -598,7 +598,7 @@ public class Application.Controller : Geary.BaseObject {
         add_window_accelerators(ACTION_REPLY_ALL_MESSAGE, { "<Ctrl><Shift>R", "<Shift>R" });
         add_window_accelerators(ACTION_FORWARD_MESSAGE, { "<Ctrl>L", "F" });
         add_window_accelerators(ACTION_FIND_IN_CONVERSATION, { "<Ctrl>F", "slash" });
-        add_window_accelerators(ACTION_ARCHIVE_CONVERSATION, { "<Ctrl>A", "A" });
+        add_window_accelerators(ACTION_ARCHIVE_CONVERSATION, { "<Ctrl>A", "A", "Y" });
         add_window_accelerators(ACTION_TRASH_CONVERSATION, { "Delete", "BackSpace" });
         add_window_accelerators(ACTION_DELETE_CONVERSATION, { "<Shift>Delete", "<Shift>BackSpace" });
         add_window_accelerators(ACTION_ZOOM+("('in')"), { "<Ctrl>equal", "<Ctrl>plus" });
diff --git a/ui/gtk/help-overlay.ui b/ui/gtk/help-overlay.ui
index 2ec893d9..08f5e01a 100644
--- a/ui/gtk/help-overlay.ui
+++ b/ui/gtk/help-overlay.ui
@@ -308,7 +308,7 @@
                             <object class="GtkShortcutsShortcut">
                                 <property name="visible">True</property>
                                 <property name="title" translatable="yes" context="shortcut window">Archive conversation</property>
-                                <property name="accelerator">A</property>
+                                <property name="accelerator">A Y</property>
                             </object>
                         </child>
                         <child>