diff --git a/.config/X11/xserverrc b/.config/X11/xserverrc
index b4de252..790c916 100644
--- a/.config/X11/xserverrc
+++ b/.config/X11/xserverrc
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
+exec /usr/bin/Xorg -nolisten tcp -nolisten local -keeptty "$@" vt$XDG_VTNR
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index 670e587..d7de27c 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -1,3 +1,4 @@
+# Autostart X
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-	xinit -- vt$XDG_VTNR
+	xinit
 fi