diff --git a/usr/bin/portproton-session-select b/usr/bin/portproton-session-select
index b2f742a..fe5d444 100755
--- a/usr/bin/portproton-session-select
+++ b/usr/bin/portproton-session-select
@@ -77,10 +77,14 @@ fi
 
 de_normalized="${DE,,}"
 
+# TODO: Check ALT Workstation session_launcher
+
 case "$session" in
   desktop)
     if [[ "$SESSION_TYPE" == "wayland" ]]; then
-      if [[ "$de_normalized" == *gnome* ]]; then
+      if [[ "$de_normalized" == *onyx* ]]; then
+        session_launcher="onyx-wayland"
+      elif [[ "$de_normalized" == *gnome* ]]; then
         session_launcher="gnome-wayland"
       elif [[ "$de_normalized" == *kde* ]]; then
         session_launcher="plasma"
@@ -91,7 +95,9 @@ case "$session" in
         session_launcher="xfce-wayland"
       fi
     else
-      if [[ "$de_normalized" == *gnome* ]]; then
+      if [[ "$de_normalized" == *onyx* ]]; then
+        session_launcher="onyx"
+      elif [[ "$de_normalized" == *gnome* ]]; then
         session_launcher="gnome-xorg"
       elif [[ "$de_normalized" == *kde* ]]; then
         session_launcher="plasmax11"
diff --git a/usr/bin/portprotonqt-desktop-return b/usr/bin/portprotonqt-desktop-return
index a7ab76b..76e7734 100755
--- a/usr/bin/portprotonqt-desktop-return
+++ b/usr/bin/portprotonqt-desktop-return
@@ -7,7 +7,7 @@ CONFIG_FILE="$HOME/.config/gamescope-session-type"
 if [[ -f "$CONFIG_FILE" ]] && grep -q 'autologin=true' "$CONFIG_FILE"; then
     XDG_DESKTOP=$(echo "${XDG_CURRENT_DESKTOP,,}")
 
-    if [[ "$XDG_DESKTOP" == *gnome* ]]; then
+    if [[ "$XDG_DESKTOP" == *gnome* || "$XDG_DESKTOP" == *onix* ]]; then
         exec gnome-session-quit --no-prompt
     elif [[ "$XDG_DESKTOP" == *kde* ]]; then
         VERSION=$(grep -E '^X-KDE-PluginInfo-Version=' /usr/share/xsessions/plasmax11.desktop 2>/dev/null | cut -d'=' -f2)