diff --git a/app/data/scrcpy-console.bat b/app/data/scrcpy-console.bat
index b90be29a..0ea7619f 100644
--- a/app/data/scrcpy-console.bat
+++ b/app/data/scrcpy-console.bat
@@ -1,4 +1,2 @@
 @echo off
-scrcpy.exe %*
-:: if the exit code is >= 1, then pause
-if errorlevel 1 pause
+scrcpy.exe --pause-on-exit=if-error %*
diff --git a/app/data/scrcpy-console.desktop b/app/data/scrcpy-console.desktop
index 0e2f9ab0..6ca1e36a 100644
--- a/app/data/scrcpy-console.desktop
+++ b/app/data/scrcpy-console.desktop
@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/bash --norc --noprofile -i -c "\"\\$SHELL\" -i -c scrcpy || read -p 'Press Enter to quit...'"
+Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy --pause-on-exit=if-error"
 Icon=scrcpy
 Terminal=true
 Type=Application