diff --git a/data/dev.geopjr.Collision.gresource.xml b/data/dev.geopjr.Collision.gresource.xml
index 67f04869..2daff7ae 100644
--- a/data/dev.geopjr.Collision.gresource.xml
+++ b/data/dev.geopjr.Collision.gresource.xml
@@ -9,7 +9,7 @@
     <file compressed="true" preprocess="xml-stripblanks" alias="icons/scalable/actions/paper-symbolic.svg">icons/paper-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/application.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/hash_row.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">ui/shortcuts_window.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks" alias="shortcuts-dialog.ui">ui/shortcuts-dialog.ui</file>
   </gresource>
 
   <gresource prefix="/dev/geopjr/Collision/icons/scalable/apps/">
diff --git a/data/ui/application.ui b/data/ui/application.ui
index 88895094..677ba263 100644
--- a/data/ui/application.ui
+++ b/data/ui/application.ui
@@ -12,7 +12,7 @@
 		</item>
 		<item>
 			<attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-			<attribute name="action">win.show-help-overlay</attribute>
+			<attribute name="action">app.shortcuts</attribute>
 		</item>
 		<item>
 			<attribute name="label" translatable="yes">_About Collision</attribute>
diff --git a/data/ui/shortcuts-dialog.ui b/data/ui/shortcuts-dialog.ui
new file mode 100644
index 00000000..b4f94ce7
--- /dev/null
+++ b/data/ui/shortcuts-dialog.ui
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="AdwShortcutsDialog" id="shortcuts_dialog">
+    <child>
+      <object class="AdwShortcutsSection">
+        <property name="title" translatable="yes">General</property>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes">Open a File</property>
+            <property name="action-name">app.open-file</property>
+          </object>
+        </child>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes">Show Keyboard Shortcuts</property>
+            <property name="action-name">app.shortcuts</property>
+          </object>
+        </child>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes">New Window</property>
+            <property name="action-name">app.new-window</property>
+          </object>
+        </child>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes">Close Window</property>
+            <property name="action-name">window.close</property>
+          </object>
+        </child>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes">Quit</property>
+            <property name="action-name">app.quit</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
\ No newline at end of file
diff --git a/data/ui/shortcuts_window.ui b/data/ui/shortcuts_window.ui
deleted file mode 100644
index c7311efe..00000000
--- a/data/ui/shortcuts_window.ui
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkShortcutsWindow" id="help_overlay">
-    <property name="modal">1</property>
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="section-name">shortcuts</property>
-        <property name="max-height">10</property>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="title" translatable="yes">General</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">Open a File</property>
-                <property name="action-name">app.open-file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">Show Keyboard Shortcuts</property>
-                <property name="action-name">win.show-help-overlay</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">New Window</property>
-                <property name="action-name">app.new-window</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">Close Window</property>
-                <property name="action-name">window.close</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes">Quit</property>
-                <property name="action-name">app.quit</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
\ No newline at end of file