diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c9ce2c..c70bce6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ jobs:
       with:
         bundle: hu.kramo.Cartridges.Devel.flatpak
         manifest-path: flatpak/hu.kramo.Cartridges.Devel.json
+        repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo
+        repository-name: gnome-nightly
 
   windows:
     name: Windows
@@ -47,7 +49,7 @@ jobs:
       - name: Test
         shell: msys2 {0}
         run: |
-          set +e  
+          set +e
           timeout 2 cartridges; [ "$?" -eq "124" ]
 
       - name: Inno Setup
@@ -57,4 +59,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Windows Installer
-          path: _build/windows/Output/Cartridges Setup.exe
\ No newline at end of file
+          path: _build/windows/Output/Cartridges Setup.exe
diff --git a/cartridges/main.py b/cartridges/main.py
index 3023663..65042e5 100644
--- a/cartridges/main.py
+++ b/cartridges/main.py
@@ -153,7 +153,6 @@ class CartridgesApplication(Adw.Application):
                 ("go_to_parent", ("<alt>Up",), shared.win),
                 ("go_home", ("<alt>Home",), shared.win),
                 ("toggle_search", ("<primary>f",), shared.win),
-                ("escape", ("Escape",), shared.win),
                 ("undo", ("<primary>z",), shared.win),
                 ("open_menu", ("F10",), shared.win),
                 ("close", ("<primary>w",), shared.win),
diff --git a/cartridges/window.py b/cartridges/window.py
index 81350b1..1fb9553 100644
--- a/cartridges/window.py
+++ b/cartridges/window.py
@@ -469,15 +469,6 @@ class CartridgesWindow(Adw.ApplicationWindow):
 
         search_entry.set_text("")
 
-    def on_escape_action(self, *_args: Any) -> None:
-        if (
-            self.get_focus() == self.search_entry.get_focus_child()
-            or self.hidden_search_entry.get_focus_child()
-        ):
-            self.on_toggle_search_action()
-        else:
-            self.navigation_view.pop()
-
     def show_details_page_search(self, widget: Gtk.Widget) -> None:
         library = (
             self.hidden_library if widget == self.hidden_search_entry else self.library
diff --git a/data/gtk/window.blp b/data/gtk/window.blp
index 7217a79..bc0f6dc 100644
--- a/data/gtk/window.blp
+++ b/data/gtk/window.blp
@@ -201,6 +201,13 @@ template $CartridgesWindow : Adw.ApplicationWindow {
                   SearchEntry search_entry {
                     placeholder-text: _("Search");
                     hexpand: true;
+
+                    ShortcutController {
+                      Shortcut {
+                          trigger: "Escape";
+                          action: "action(win.toggle_search)";
+                      }
+                    }
                   }
                 }
               }
@@ -261,6 +268,11 @@ Adw.NavigationPage hidden_library_page {
         SearchEntry hidden_search_entry {
           placeholder-text: _("Search");
           hexpand: true;
+
+          Shortcut {
+            trigger: "Escape";
+            action: "action(win.toggle_search)";
+          }
         }
       }
     }