diff --git a/.xinitrc b/.xinitrc
index 3a2b9a5..8cce8b3 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -15,5 +15,7 @@ then
     mpdscribble &
 fi
 
-test -n "$1" && wm=$1 || wm="emacs"
+emacs --daemon &
+
+test -n "$1" && wm=$1 || wm="herbstluftwm"
 exec $wm