diff --git a/src/bin/clapper-app/clapper-app-application.c b/src/bin/clapper-app/clapper-app-application.c
index 1c9f4291..d5d5206b 100644
--- a/src/bin/clapper-app/clapper-app-application.c
+++ b/src/bin/clapper-app/clapper-app-application.c
@@ -527,7 +527,7 @@ clapper_app_application_constructed (GObject *object)
     { "app.about", { "F1", NULL, NULL }},
     { "win.toggle-fullscreen", { "F11", "f", NULL }},
     { "win.show-help-overlay", { "<Control>question", NULL, NULL }},
-    { "window.close", { "<Control>q", NULL, NULL }},
+    { "window.close", { "<Control>q", "q", NULL }},
   };
 
   /* Override initial ranks, they will be updated
diff --git a/src/bin/clapper-app/ui/clapper-app-help-overlay.ui b/src/bin/clapper-app/ui/clapper-app-help-overlay.ui
index 7f0b41c0..9ce94d72 100644
--- a/src/bin/clapper-app/ui/clapper-app-help-overlay.ui
+++ b/src/bin/clapper-app/ui/clapper-app-help-overlay.ui
@@ -30,7 +30,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes">Quit</property>
-                <property name="accelerator">&lt;Ctrl&gt;Q</property>
+                <property name="accelerator">&lt;Ctrl&gt;q q</property>
               </object>
             </child>
           </object>
@@ -41,13 +41,13 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes">Add Files…</property>
-                <property name="accelerator">&lt;Ctrl&gt;O</property>
+                <property name="accelerator">&lt;Ctrl&gt;o</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes">Add URI…</property>
-                <property name="accelerator">&lt;Ctrl&gt;U</property>
+                <property name="accelerator">&lt;Ctrl&gt;u</property>
               </object>
             </child>
           </object>
@@ -86,7 +86,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes">Change progression mode</property>
-                <property name="accelerator">&lt;Ctrl&gt;P</property>
+                <property name="accelerator">&lt;Ctrl&gt;p</property>
               </object>
             </child>
           </object>
@@ -150,7 +150,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes">Toggle mute</property>
-                <property name="accelerator">M</property>
+                <property name="accelerator">m</property>
               </object>
             </child>
             <child>