diff --git a/configs/appcfg/xinit_template b/configs/appcfg/xinit_template
index c497864..9694094 100644
--- a/configs/appcfg/xinit_template
+++ b/configs/appcfg/xinit_template
@@ -52,6 +52,8 @@ command -v firefox && export BROWSER=firefox
 #(useful for getting notifications)
 #export SXMO_RTCWAKEINTERVAL=300
 
+export TERMCMD="st -e"
+
 # Immediately turn the screen off when locking the device
 export SXMO_LOCK_SCREEN_OFF=1
 
diff --git a/scripts/core/sxmo_terminal.sh b/scripts/core/sxmo_terminal.sh
index b169ead..bba64a8 100755
--- a/scripts/core/sxmo_terminal.sh
+++ b/scripts/core/sxmo_terminal.sh
@@ -1,17 +1,7 @@
 #!/usr/bin/env sh
 
-# You can export a different terminal in your xinit
-TERMCMD="${TERMCMD:-st}"
-TERMMODE=$([ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] && echo "true")
-
-if [ "$TERMMODE" = "true" ]; then
-	while [ "-e" != "$1" ] || [ 0 -eq $# ]; do
-		shift
-	done
-	shift
-else
-	set -- "$TERMCMD" -e "$@"
-fi
+# shellcheck disable=SC2086
+set -- $TERMCMD "$@"
 
 if [ -z "$*" ]; then
 	echo "sxmo_terminal.sh called in TERMMODE without any arguments (returning, nothing to do)" >&2