diff --git a/xonsh/kitty.xsh b/xonsh/kitty.xsh
new file mode 100644
index 0000000..7313b54
--- /dev/null
+++ b/xonsh/kitty.xsh
@@ -0,0 +1,6 @@
+if $TERM == "xterm-kitty":
+    # Wrap ssh with environment variable because servers tend to deal poorly with kitty
+    def xterm_ssh(args):
+        $TERM="xterm-256color" ssh @(*args)
+
+    aliases["ssh"] = xterm_ssh
diff --git a/xonsh/rc.xsh b/xonsh/rc.xsh
index e6b0ea8..806eb2c 100644
--- a/xonsh/rc.xsh
+++ b/xonsh/rc.xsh
@@ -27,7 +27,7 @@ $ALTERNATE_EDITOR = "vim"
 $TERMINAL = "kitty"
 
 config_dir = p"~/.dotfiles/xonsh"
-xsh_modules = ["prompt", "nix", "path", "alias", "java", "linux", "python", "local", "docker"]
+xsh_modules = ["prompt", "nix", "path", "alias", "java", "linux", "python", "local", "docker", "kitty"]
 
 for module in xsh_modules:
     _p = config_dir / f"{module}.xsh"