diff --git a/modules/x11.nix b/modules/x11.nix
index 15ba5c1..f75d611 100644
--- a/modules/x11.nix
+++ b/modules/x11.nix
@@ -16,8 +16,9 @@
     ];
     extraInit = ''
       export XAUTHORITY=/tmp/Xauthority
-      export xserverauthfile=$XAUTHORITY
+      export xserverauthfile=/tmp/xserverauth
       [ -e ~/.Xauthority ] && mv -f ~/.Xauthority "$XAUTHORITY"
+      [ -e ~/.xserverauth*] && mv -f ~/.xserverauth* "$xserverauthfile"
     '';
   };