diff --git a/Containerfile b/Containerfile
index ffe87bd7fc..37b642a6d6 100644
--- a/Containerfile
+++ b/Containerfile
@@ -245,6 +245,7 @@ RUN rpm-ostree install \
         tuned-profiles-atomic \
         tuned-profiles-cpu-partitioning \
         powertop \
+        joystickwake \
         hl2linux-selinux \
         joycond \
         ladspa-caps-plugins \
diff --git a/README.md b/README.md
index bfbaea3c7b..0fd146bbbb 100644
--- a/README.md
+++ b/README.md
@@ -294,6 +294,7 @@ Ported SteamOS and ChimeraOS packages, among others used by Bazzite, are built o
 | [gnome-shell-extension-compiz-windows-effect](https://github.com/hermes83/compiz-windows-effect)    | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-shell-extension-compiz-windows-effect/status_image/last_build.png?) |
 | [gnome-shell-extension-hanabi](https://github.com/jeffshee/gnome-ext-hanabi)                        | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-shell-extension-hanabi/status_image/last_build.png?)                |
 | [gnome-shell-extension-hotedge](https://github.com/jdoda/hotedge)                                   | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-shell-extension-hotedge/status_image/last_build.png?)               |
+| [joystickwake](https://github.com/foresto/joystickwake)                                             | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/joystickwake/status_image/last_build.png?)                                |
 | jupiter-fan-control                                                                                 | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/jupiter-fan-control/status_image/last_build.png?)                         |
 | jupiter-hw-support-[btrfs](https://gitlab.com/popsulfr/steamos-btrfs)                               | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/jupiter-hw-support-btrfs/status_image/last_build.png?)                    |
 | [mangohud](https://github.com/flightlessmango/MangoHud)                                             | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/package/mangohud/status_image/last_build.png?)                           |
diff --git a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl
index 51eee5dcf9..814f343041 100644
--- a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl
+++ b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl
@@ -91,6 +91,7 @@ process-scheduler enable=true {
         hhd
         input-remapper-service
         ionice
+        joystickwake
         mangoapp
         nice
         otd-daemon
diff --git a/system_files/desktop/kinoite/usr/etc/xdg/autostart/joystickwake.desktop b/system_files/desktop/kinoite/usr/etc/xdg/autostart/joystickwake.desktop
new file mode 100644
index 0000000000..e495cd5a1c
--- /dev/null
+++ b/system_files/desktop/kinoite/usr/etc/xdg/autostart/joystickwake.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Joystick Wake
+Comment=Joystick-aware screen waker
+Icon=input-gaming
+NoDisplay=true
+Exec=joystickwake --command "qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement wakeup"
+Terminal=false
diff --git a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl
index e620145ccf..b97b0b8a1d 100644
--- a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl
+++ b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl
@@ -88,6 +88,7 @@ process-scheduler enable=true {
         gamescope
         input-remapper-service
         ionice
+        joystickwake
         nice
         otd-daemon
         oversteer