diff --git a/bash/bashrc b/bash/bashrc
index 318c88860..2b95718d0 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -11,7 +11,7 @@ export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock
 
 # agetty is set to automatically log me in on tty1
 # Automatically launch GUI on tty1 after login
-if [ "$(tty)" == '/dev/tty1' ]; then
+if [ "$(tty)" == '/dev/tty1' ] && [ ! $SSH_TTY ]; then
     . ${HOME}/.dotfiles/bash/bash_login
     LAST_GUI=`cat ${HOME}/.spool/last_login_gui 2>/dev/null`
     if [ -f "${HOME}/.spool/last_login_gui" ]; then