diff --git a/cli/fish/config.fish b/cli/fish/config.fish
index fa82fc0..8edf169 100644
--- a/cli/fish/config.fish
+++ b/cli/fish/config.fish
@@ -59,5 +59,13 @@ if status is-interactive
 
     # === auto cd into last activated directory
     cd $last_pwd
+
+    if test -n "$TMUX"
+        function ssh
+            tmux rename-window $argv[1]
+            command ssh $argv
+            tmux setw automatic-rename
+        end
+    end
 end