diff --git a/Containerfile b/Containerfile
index 206eca31..b02ababf 100644
--- a/Containerfile
+++ b/Containerfile
@@ -284,6 +284,7 @@ RUN rpm-ostree install \
     jupiter-fan-control \
     jupiter-hw-support-btrfs \
     powerbuttond \
+    HandyGCCS \
     vpower \
     ds-inhibit \
     steam_notif_daemon \
@@ -411,6 +412,7 @@ RUN rm /usr/share/applications/wine*.desktop && \
         systemctl enable sddm.service \
     ; fi && \
     systemctl enable bazzite-autologin.service && \
+    systemctl enable handycon.service && \
     systemctl enable jupiter-fan-control.service && \
     systemctl enable btrfs-dedup@run-media-mmcblk0p1.timer && \
     systemctl enable vpower.service && \
diff --git a/system_files/deck/shared/usr/bin/bazzite-autologin b/system_files/deck/shared/usr/bin/bazzite-autologin
index dbe9a307..50eb585a 100755
--- a/system_files/deck/shared/usr/bin/bazzite-autologin
+++ b/system_files/deck/shared/usr/bin/bazzite-autologin
@@ -24,11 +24,13 @@ elif [[ ${BASE_IMAGE_NAME} =~ "kinoite" ]]; then
   else
     sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF}
   fi
+  systemctl stop handycon.service
 elif [[ ${BASE_IMAGE_NAME} =~ "silverblue" ]]; then
   if ${DESKTOP_WAYLAND}; then
     sed -i 's/.*Session=.*/Session=gnome-wayland.desktop/g' ${SDDM_CONF}
   else
     sed -i 's/.*Session=.*/Session=gnome-xorg.desktop/g' ${SDDM_CONF}
   fi
+  systemctl stop handycon.service
 fi
 sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}
diff --git a/system_files/deck/shared/usr/bin/steamos-session-select b/system_files/deck/shared/usr/bin/steamos-session-select
index 990435e1..1df3de6e 100755
--- a/system_files/deck/shared/usr/bin/steamos-session-select
+++ b/system_files/deck/shared/usr/bin/steamos-session-select
@@ -121,6 +121,12 @@ fi
   echo "Session=$session_launcher"
 } > "$CONF_FILE"
 
+if [[ $session_launcher = "gamescope-session.desktop" ]]; then
+  systemctl start handycon.service
+else
+  systemctl stop handycon.service
+fi
+
 echo "Updated system autologin session to $session_launcher"
 systemctl reset-failed sddm
 systemctl restart sddm