diff --git a/includes/bash_prompt.bash b/includes/bash_prompt.bash
index 22f302d..b0d2144 100644
--- a/includes/bash_prompt.bash
+++ b/includes/bash_prompt.bash
@@ -102,7 +102,7 @@ function prompt_command {
 
 	# Terminal title
 	TITLE=`basename ${PWDNAME}`
-	[ $SHLVL -gt 1 ] && TITLE="${TITLE} — ${HOSTNAME}"
+	[ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] && TITLE="${TITLE} — ${HOSTNAME}"
 	echo -ne "\033]0;${TITLE}"; echo -ne "\007"
 }