diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index ad92cc8..bcc26ce 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -14,7 +14,7 @@ end
 
 # Start X at login
 if status is-login
-  if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
+  if test -z "$DISPLAY" -a "$XDG_VTNR" = 1 -a -z "$TMUX"
     exec startx -- -keeptty
   end
 end