diff --git a/xonsh/localhost.xsh b/xonsh/localhost.xsh
index 7c41710..2a54a8c 100644
--- a/xonsh/localhost.xsh
+++ b/xonsh/localhost.xsh
@@ -28,3 +28,9 @@ $XDG_DATA_DIRS = [
   "/usr/local/share",
   $HOME + "/.nix-profile/share"
 ]
+
+# Make sure cd isn't run as a subprocess.
+# Gods help us that this is necessary.
+import xonsh.tools
+aliases['cd'] = xonsh.tools.unthreadable(xonsh.dirstack.cd)
+