diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 7d2f7678..b2e00d75 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -4,14 +4,14 @@
 
   programs.fish = {
     enable = true;
-    shellInit = ''
+    interactiveShellInit = ''
       set EDITOR vim
       ssh-add > /dev/null &> /dev/null
       if set -q TMUX 
       else 
         if set -q DISABLE_TMUX
         else
-          tmux new-session -A main
+          tmux attach || exec tmux new-session && exit
         end
       end
     '';