diff --git a/common/fish/config.fish b/common/fish/config.fish
index 81c1890..c532882 100755
--- a/common/fish/config.fish
+++ b/common/fish/config.fish
@@ -59,10 +59,11 @@ end
 
 # If we're running the shell interactively from inside Kitty, assume that we will be using Kitty's multiplexing features
 # Otherwise, assume we're in a context that is not capable of "native" multiplexing features and run everything inside Zellij
-if set --query FISH_START_ZELLIJ
-	set ZELLIJ_AUTO_ATTACH true
-	set ZELLIJ_AUTO_EXIT true
-  eval (zellij setup --generate-auto-start fish | string collect)
-else if set --query FISH_START_TMUX
+if set --query FISH_START_ZELLIJ && status is-interactive
+	# simulate auto attach
+  zellij attach -c || zellij attach -c (zellij list-sessions | grep -v '(current)' | head -n 1) || zellij
+	# simulate auto kill
+  kill $fish_pid
+else if set --query FISH_START_TMUX && status is-interactive
 	tmux att -t default || tmux new -s default
 end
\ No newline at end of file