diff --git a/plugins/kitty/kitty.plugin.zsh b/plugins/kitty/kitty.plugin.zsh
index 6e480dac6..1094236a7 100644
--- a/plugins/kitty/kitty.plugin.zsh
+++ b/plugins/kitty/kitty.plugin.zsh
@@ -2,12 +2,15 @@
 # Kitty plugin for oh-my-zsh                        #
 #####################################################
 
-# kssh
-# Use this when your terminfo isn't recognized on remote hosts.
-# See: https://sw.kovidgoyal.net/kitty/faq/#i-get-errors-about-the-terminal-being-unknown-or-opening-the-terminal-failing-when-sshing-into-a-different-computer
-alias kssh="kitty +kitten ssh"
-# Use this if kssh fails
-alias kssh-slow="infocmp -a xterm-kitty | ssh myserver tic -x -o \~/.terminfo /dev/stdin"
+if [[ "$TERM" == 'xterm-kitty' ]]; then
+  ## kssh
+  # Use this when your terminfo isn't recognized on remote hosts.
+  # See: https://sw.kovidgoyal.net/kitty/faq/#i-get-errors-about-the-terminal-being-unknown-or-opening-the-terminal-failing-when-sshing-into-a-different-computer
+  alias kssh="kitty +kitten ssh"
+  compdef kssh='ssh'
+  # Use this if kssh fails
+  alias kssh-slow="infocmp -a xterm-kitty | ssh myserver tic -x -o \~/.terminfo /dev/stdin"
 
-# Change the colour theme
-alias kitty-theme="kitty +kitten themes"
+  # Change the colour theme
+  alias kitty-theme="kitty +kitten themes"
+fi