diff --git a/errands/resources/errands.gresource.xml b/errands/resources/errands.gresource.xml
index 92d4a76c..6f38c975 100644
--- a/errands/resources/errands.gresource.xml
+++ b/errands/resources/errands.gresource.xml
@@ -3,6 +3,7 @@
   <gresource prefix="/io/github/mrvladus/Errands">
     <file alias="style.css">resources/style.css</file>
     <file alias="style-dark.css">resources/style-dark.css</file>
+    <file preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">resources/gtk/help-overlay.ui</file>
   </gresource>
   <gresource prefix="/io/github/mrvladus/Errands/icons/scalable/actions/">
     <file preprocess="xml-stripblanks" alias="errands-up.svg">resources/icons/errands-up.svg</file>
diff --git a/errands/resources/gtk/help-overlay.ui b/errands/resources/gtk/help-overlay.ui
new file mode 100644
index 00000000..c5f658af
--- /dev/null
+++ b/errands/resources/gtk/help-overlay.ui
@@ -0,0 +1,45 @@
+<interface>
+  <object class="GtkShortcutsWindow" id="help_overlay">
+    <child>
+      <object class="GtkShortcutsSection">
+
+        <!-- General -->
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="title" translatable="yes">General</property>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes">Show keyboard shortcuts</property>
+                <property name="accelerator">&lt;Control&gt;question</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes">Toggle sidebar</property>
+                <property name="accelerator">F9</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes">Preferences</property>
+                <property name="accelerator">&lt;Control&gt;comma</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes">Quit</property>
+                <property name="accelerator">&lt;Control&gt;q &lt;Control&gt;w</property>
+              </object>
+            </child>
+
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+
+</interface>
\ No newline at end of file
diff --git a/errands/widgets/lists.py b/errands/widgets/lists.py
index 8a3af604..c2efd673 100644
--- a/errands/widgets/lists.py
+++ b/errands/widgets/lists.py
@@ -131,7 +131,7 @@ def _build_ui(self):
         menu: Gio.Menu = Gio.Menu.new()
         menu.append(_("Sync / Fetch Tasks"), "app.sync")  # type:ignore
         menu.append(_("Preferences"), "app.preferences")  # type:ignore
-        menu.append(_("Keyboard Shortcuts"), "app.shortcuts")  # type:ignore
+        menu.append(_("Keyboard Shortcuts"), "win.show-help-overlay")  # type:ignore
         menu.append(_("About Errands"), "app.about")  # type:ignore
         menu_btn = Gtk.MenuButton(
             menu_model=menu,
diff --git a/errands/widgets/shortcuts_window.py b/errands/widgets/shortcuts_window.py
deleted file mode 100644
index 149408e8..00000000
--- a/errands/widgets/shortcuts_window.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2023 Vlad Krupinskii <mrvladus@yandex.ru>
-# SPDX-License-Identifier: MIT
-
-from gi.repository import Adw, Gtk
-
-xml = f"""
-<interface>
-<template class="ShortcutsWindow" parent="GtkShortcutsWindow">
-<property name="hide-on-close">true</property>
-<property name="modal">true</property>
-<child>
-<object class="GtkShortcutsSection">
-
-<!-- General -->
-<child>
-<object class="GtkShortcutsGroup">
-<property name="title" translatable="yes">{_("General")}</property>
-
-<child>
-<object class="GtkShortcutsShortcut">
-<property name="title" translatable="yes">{_("Show keyboard shortcuts")}</property>
-<property name="accelerator">&lt;Control&gt;question</property>
-</object>
-</child>
-
-<child>
-<object class="GtkShortcutsShortcut">
-<property name="title" translatable="yes">{_("Toggle sidebar")}</property>
-<property name="accelerator">F9</property>
-</object>
-</child>
-
-<child>
-<object class="GtkShortcutsShortcut">
-<property name="title" translatable="yes">{_("Preferences")}</property>
-<property name="accelerator">&lt;Control&gt;comma</property>
-</object>
-</child>
-
-<child>
-<object class="GtkShortcutsShortcut">
-<property name="title" translatable="yes">{_("Quit")}</property>
-<property name="accelerator">&lt;Control&gt;q &lt;Control&gt;w</property>
-</object>
-</child>
-
-</object>
-</child>
-</object>
-</child>
-</template>
-</interface>
-"""
-
-
-@Gtk.Template(string=xml)
-class ShortcutsWindow(Gtk.ShortcutsWindow):
-    __gtype_name__ = "ShortcutsWindow"
-
-    def __init__(self, window: Adw.ApplicationWindow):
-        super().__init__()
-        self.set_transient_for(window)
-        self.present()
diff --git a/errands/widgets/task_list.py b/errands/widgets/task_list.py
index 6ea8e4c2..85c3f7d1 100644
--- a/errands/widgets/task_list.py
+++ b/errands/widgets/task_list.py
@@ -37,6 +37,14 @@ def build_ui(self):
             icon_name="sidebar-show-symbolic",
             tooltip_text=_("Toggle Sidebar"),  # type:ignore
         )
+        toggle_ctrl = Gtk.ShortcutController(scope=1)
+        toggle_ctrl.add_shortcut(
+            Gtk.Shortcut(
+                trigger=Gtk.ShortcutTrigger.parse_string("F9"),
+                action=Gtk.ShortcutAction.parse_string("activate"),
+            )
+        )
+        self.toggle_sidebar_btn.add_controller(toggle_ctrl)
         # Delete completed button
         self.delete_completed_btn = Gtk.Button(
             valign="center",
diff --git a/errands/widgets/window.py b/errands/widgets/window.py
index 100eac12..9fc8c5dd 100644
--- a/errands/widgets/window.py
+++ b/errands/widgets/window.py
@@ -5,7 +5,6 @@
 from errands.widgets.trash import Trash
 from gi.repository import Gio, Adw, Gtk
 from errands.widgets.lists import Lists
-from errands.widgets.shortcuts_window import ShortcutsWindow
 from errands.widgets.preferences import PreferencesWindow
 from errands.utils.sync import Sync
 from errands.utils.gsettings import GSettings
@@ -121,9 +120,6 @@ def _sync(*args):
             lambda *_: PreferencesWindow(self).show(),
             ["<primary>comma"],
         )
-        _create_action(
-            "shortcuts", lambda *_: ShortcutsWindow(self), ["<primary>question"]
-        )
         _create_action("about", _about)
         _create_action("sync", _sync, ["<primary>s"])
         _create_action(