diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 0b484e7..705f576 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,3 +1,12 @@
+########################
+# AUTOSTART X AT LOGIN #
+########################
+if status --is-login
+    if test -z "$DISPLAY" -a $XDG_VTNR = 1
+        exec startx -- -keeptty
+    end
+end
+
 ############
 # GREETING #
 ############