diff --git a/NonSteamLaunchers.sh b/NonSteamLaunchers.sh
index 0760c7c..820d300 100644
--- a/NonSteamLaunchers.sh
+++ b/NonSteamLaunchers.sh
@@ -1843,16 +1843,31 @@ if [[ $options == *"Humble Games Collection"* ]]; then
     # User selected Humble Games Launcher
     echo "User selected Humble Games Collection"
 
+    if [[ ! -f "$HOME/.local/share/applications/Humble-scheme-handler.desktop" ]]; then
+        wget https://raw.githubusercontent.com/Zoullx/NonSteamLaunchers-On-Steam-Deck/fix-humble-login/humble-app/Humble-scheme-handler.desktop -O /tmp/Humble-scheme-handler.desktop
+        cat /tmp/Humble-scheme-handler.desktop | sed "s/{{APPID}}/$appid/" > /tmp/Humble-scheme-handler.desktop
+        desktop-file-install --rebuild-mime-info-cache --dir=$HOME/.local/share/applications /tmp/Humble-scheme-handler.desktop
+        rm -rf /tmp/Humble-scheme-handler.desktop
+    fi
 
+    if [[ ! -f "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" ]]; then
+        wget https://raw.githubusercontent.com/Zoullx/NonSteamLaunchers-On-Steam-Deck/fix-humble-login/humble-app/handle-humble-scheme -O "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme"
+        cat "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" | sed "s/{{APPID}}/$appid/ > "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme"
+        chmod +x "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme"
+    fi
+
+    if [[ ! -f "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/start-humble.cmd" ]]; then
+        wget https://raw.githubusercontent.com/Zoullx/NonSteamLaunchers-On-Steam-Deck/fix-humble-login/humble-app/start-humble.cmd -O "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/start-humble.cmd"
+    fi
 
     if [[ ! -f "$humblegames_path1" ]] && [[ ! -f "$humblegames_path2" ]]; then
         # Humble Games Launcher is not installed
 
         # Set the appid for the Humble Games Launcher
         if [ "$use_separate_appids" = true ]; then
-        appid=HumbleGamesLauncher
+            appid=HumbleGamesLauncher
         else
-        appid=NonSteamLaunchers
+            appid=NonSteamLaunchers
         fi
 
 
@@ -2150,11 +2165,11 @@ elif [[ -f "$legacygames_path2" ]]; then
 fi
 if [[ -f "$humblegames_path1" ]]; then
     # Humble Games Launcher is installed at path 1
-    humbleshortcutdirectory="\"$humblegames_path1\""
+    humbleshortcutdirectory="\"$HOME/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/start-humble.cmd\""
     humblelaunchoptions="STEAM_COMPAT_DATA_PATH=\"$HOME/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/\" %command%"
 elif [[ -f "$humblegames_path2" ]]; then
     # Humble Games Launcher is installed at path 2
-    humbleshortcutdirectory="\"$humblegames_path2\""
+    humbleshortcutdirectory="\"$HOME/.local/share/Steam/steamapps/compatdata/HumbleGamesLauncher/pfx/start-humble.cmd\""
     humblelaunchoptions="STEAM_COMPAT_DATA_PATH=\"$HOME/.local/share/Steam/steamapps/compatdata/HumbleGamesLauncher/\" %command%"
 fi
 if [[ -f "$indiegala_path1" ]]; then
diff --git a/humble-app/Humble-scheme-handler.desktop b/humble-app/Humble-scheme-handler.desktop
index 2b0c2c2..ae585af 100644
--- a/humble-app/Humble-scheme-handler.desktop
+++ b/humble-app/Humble-scheme-handler.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Humble App (Login)
 Comment=Target for handling Humble App logins. You should not run this manually.
-Exec=/home/deck/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/handle-humble-scheme %u
+Exec=/home/deck/.local/share/Steam/steamapps/compatdata/{{APPID}}/pfx/handle-humble-scheme %u
 Type=Application
 MimeType=x-scheme-handler/humble;
\ No newline at end of file
diff --git a/humble-app/handle-humble-scheme b/humble-app/handle-humble-scheme
index 0c98223..b96952d 100644
--- a/humble-app/handle-humble-scheme
+++ b/humble-app/handle-humble-scheme
@@ -3,9 +3,9 @@
 set -e
 
 export STEAM_COMPAT_CLIENT_INSTALL_PATH=~/.local/share/Steam
-export STEAM_COMPAT_DATA_PATH=~/.steam/steam/Steam/steamapps/compatdata/NonSteamLaunchers
+export STEAM_COMPAT_DATA_PATH=~/.steam/steam/Steam/steamapps/compatdata/{{APPID}}
 FIXED_SCHEME="$(echo "$1" | sed "s/?/\//")"
 
-echo $FIXED_SCHEME > /home/deck/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/drive_c/.auth
+echo $FIXED_SCHEME > /home/deck/.local/share/Steam/steamapps/compatdata/{{APPID}}/pfx/drive_c/.auth
 
-~/.steam/steam/steamapps/common/Proton\ -\ Experimental/proton run ~/.local/share/Steam/steamapps/compatdata/NonSteamLaunchers/pfx/start-humble.cmd
\ No newline at end of file
+~/.steam/steam/steamapps/common/Proton\ -\ Experimental/proton run ~/.local/share/Steam/steamapps/compatdata/{{APPID}}/pfx/start-humble.cmd
\ No newline at end of file