diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3019b914..c69530ca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -386,6 +386,7 @@ src/mailer/main.vala
 [type: gettext/glade]ui/composer-widget.ui
 [type: gettext/glade]ui/edit_alternate_emails.glade
 [type: gettext/glade]ui/find_bar.glade
+[type: gettext/glade]ui/gtk/help-overlay.ui
 [type: gettext/glade]ui/gtk/menus.ui
 [type: gettext/glade]ui/login.glade
 [type: gettext/glade]ui/password-dialog.glade
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 8171ed17..6e93e50e 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -11,6 +11,7 @@ set(RESOURCE_LIST
   STRIPBLANKS "edit_alternate_emails.glade"
   STRIPBLANKS "find_bar.glade"
   STRIPBLANKS "folder-popover.ui"
+  STRIPBLANKS "gtk/help-overlay.ui"
   STRIPBLANKS "gtk/menus.ui"
   STRIPBLANKS "login.glade"
   STRIPBLANKS "password-dialog.glade"
diff --git a/ui/gtk/help-overlay.ui b/ui/gtk/help-overlay.ui
new file mode 100644
index 00000000..6c360fb0
--- /dev/null
+++ b/ui/gtk/help-overlay.ui
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <object class="GtkShortcutsWindow" id="help_overlay">
+        <child>
+            <object class="GtkShortcutsSection">
+                <property name="visible">True</property>
+                <property name="max-height">12</property>
+                <property name="section-name">conversation</property>
+                <property name="title" translatable="yes">Conversation Shortcuts</property>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">General</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Move focus to the next/previous pane</property>
+                                <property name="accelerator">F6 &lt;Shift&gt;F6</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Move focus to conversation list</property>
+                                <property name="accelerator">&lt;primary&gt;B</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Detach composer window</property>
+                                <property name="accelerator">&lt;primary&gt;D</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Close composer window</property>
+                                <property name="accelerator">&lt;primary&gt;W Escape</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Show keyboard shortcuts</property>
+                                <property name="accelerator">&lt;Primary&gt;F1 &lt;Primary&gt;question</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Show help</property>
+                                <property name="accelerator">F1</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Quit the application</property>
+                                <property name="accelerator">&lt;primary&gt;Q</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">Search</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Jump to search box</property>
+                                <property name="accelerator">&lt;primary&gt;S</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Find in current conversation</property>
+                                <property name="accelerator">&lt;primary&gt;F</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Find next/previous in current conversation</property>
+                                <property name="accelerator">&lt;primary&gt;G &lt;primary&gt;&lt;Shift&gt;G</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">Actions</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Compose a new message</property>
+                                <property name="accelerator">&lt;primary&gt;N N</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Reply to sender </property>
+                                <property name="accelerator">&lt;primary&gt;R R</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Reply to all</property>
+                                <property name="accelerator">&lt;primary&gt;&lt;Shift&gt;R &lt;Shift&gt;R</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Forward</property>
+                                <property name="accelerator">&lt;primary&gt;L F</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Archive</property>
+                                <property name="accelerator">A</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Move to trash</property>
+                                <property name="accelerator">Delete Back</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Toggle spam</property>
+                                <property name="accelerator">&lt;primary&gt;J exclam</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Open Move Conversation menu</property>
+                                <property name="accelerator">M</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Open Label Conversation menu</property>
+                                <property name="accelerator">L</property>
+                            </object>
+                        </child>
+
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Mark read</property>
+                                <property name="accelerator">&lt;primary&gt;I &lt;Shift&gt;I</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Mark unread</property>
+                                <property name="accelerator">&lt;primary&gt;U &lt;Shift&gt;U</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">View</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Zoom in</property>
+                                <property name="accelerator">&lt;primary&gt;equal equal</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Zoom out</property>
+                                <property name="accelerator">&lt;primary&gt;minus minus</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Reset zoom</property>
+                                <property name="accelerator">&lt;primary&gt;0 0</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">Additional Shortcuts</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Star</property>
+                                <property name="accelerator">S</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Unstar</property>
+                                <property name="accelerator">D</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Delete</property>
+                                <property name="accelerator">&lt;Shift&gt;Delete &lt;Shift&gt;Back</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Jump to next (older) conversation</property>
+                                <property name="accelerator">J</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Jump to previous (newer) conversation</property>
+                                <property name="accelerator">K</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+            </object>
+        </child>
+        <child>
+            <object class="GtkShortcutsSection">
+                <property name="visible">True</property>
+                <property name="section-name">composer</property>
+                <property name="title" translatable="yes">Composer Shortcuts</property>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">General</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Quote text</property>
+                                <property name="accelerator">&lt;primary&gt;bracketleft</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Unquote text</property>
+                                <property name="accelerator">&lt;primary&gt;bracketright</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">Actions</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Send</property>
+                                <property name="accelerator">&lt;primary&gt;Return</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Add attachment</property>
+                                <property name="accelerator">&lt;primary&gt;T</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkShortcutsGroup">
+                        <property name="visible">True</property>
+                        <property context="shortcut window" name="title" translatable="yes">Rich text mode</property>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Bold text</property>
+                                <property name="accelerator">&lt;primary&gt;B</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Italicize text</property>
+                                <property name="accelerator">&lt;primary&gt;I</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Underline text</property>
+                                <property name="accelerator">&lt;primary&gt;U</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Strike text</property>
+                                <property name="accelerator">&lt;primary&gt;K</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Insert a link</property>
+                                <property name="accelerator">&lt;primary&gt;L</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkShortcutsShortcut">
+                                <property name="visible">True</property>
+                                <property context="shortcut window" name="title" translatable="yes">Remove formatting</property>
+                                <property name="accelerator">&lt;primary&gt;space</property>
+                            </object>
+                        </child>
+                    </object>
+                </child>
+            </object>
+        </child>
+    </object>
+</interface>
\ No newline at end of file
diff --git a/ui/gtk/menus.ui b/ui/gtk/menus.ui
index 17eacb5d..50aa4e81 100644
--- a/ui/gtk/menus.ui
+++ b/ui/gtk/menus.ui
@@ -19,6 +19,12 @@
       </item>
     </section>
     <section>
+      <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">win.show-help-overlay</attribute>
+        <attribute name="accel">&lt;Primary&gt;F1</attribute>
+        <attribute name="hidden-when">action-missing</attribute>
+      </item>
       <item>
         <attribute name="label" translatable="yes">_Help</attribute>
         <attribute name="action">app.help</attribute>