diff --git a/.bash_profile b/.bash_profile
index a64c45e..5d8256b 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -9,17 +9,16 @@
 #umask 022
 
 # if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
+if [ -n "$BASH_VERSION" ] &&  [ -f "$HOME/.bashrc" ]; then
+	."$HOME/.bashrc"
 fi
 
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
+	PATH="$HOME/bin:$PATH"
 fi
 
 # start gui
-startx
+if [ -z $DISPLAY ] && [ $XDG_VTNR -eq 1 ]; then
+	exec startx
+fi