diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 3c68095f..96ef815d 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -4,7 +4,7 @@
 
   programs.fish = {
     enable = true;
-    interactiveShellInit = ''
+    shellInitLast = ''
       set EDITOR vim
       ssh-add > /dev/null &> /dev/null
       if set -q TMUX 
@@ -14,7 +14,6 @@
           tmux attach || exec tmux new-session && exit
         end
       end
-      exit
       '';
       
       functions = {