diff --git a/distro-files/etc/profile b/distro-files/etc/profile
index 5009b71c..0cfd0af8 100644
--- a/distro-files/etc/profile
+++ b/distro-files/etc/profile
@@ -7,3 +7,8 @@ PS1="$GREEN\u$NORMAL@$BLUE\h$NORMAL:$WHITE\w$NORMAL>"
 
 alias ls="ls --color=auto"
 alias grep="grep --color=auto"
+
+if [ $(tty) == "/dev/console" ]
+then
+	alias startwm="exec /usr/libexec/astral/startwm"
+fi
diff --git a/distro-files/usr/bin/startwm b/distro-files/usr/libexec/astral/startwm
similarity index 63%
rename from distro-files/usr/bin/startwm
rename to distro-files/usr/libexec/astral/startwm
index 42195a07..3cc8bf87 100755
--- a/distro-files/usr/bin/startwm
+++ b/distro-files/usr/libexec/astral/startwm
@@ -16,6 +16,8 @@ do
 
   sleep 0.5
 done
-stty -echo -echoctl -isig
+stty -echo -echoctl -isig -icanon min 0 time 0
 xterm -e "bash -l" & &> /tmp/.xtermstderr > /tmp/.xtermstdout
-exec fvwm3 &> /tmp/.fvwm3stderr > /tmp/.fvwm3stdout
+fvwm3 &> /tmp/.fvwm3stderr > /tmp/.fvwm3stdout
+stty -echo -echoctl -isig -icanon min 0 time 0
+cat -