diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix
index aaa3c4f..1bcf049 100644
--- a/home-mods/shell/default.nix
+++ b/home-mods/shell/default.nix
@@ -52,6 +52,10 @@ in
       package = pkgs.fish;
 
       interactiveShellInit = ''
+        if test -z $INSIDE_EMACS ;
+          eval (${pkgs.zellij}/bin/zellij setup --generate-auto-start fish | string collect)
+        end
+
         any-nix-shell fish --info-right | source
         function starship_transient_rprompt_func
           set width "$(calc "($(tput cols)-12)/2")"
@@ -254,8 +258,6 @@ in
 
     zellij = {
       enable = true;
-      enableFishIntegration = true;
-      enableBashIntegration = true;
     };
 
     zoxide.enable = true;
@@ -299,7 +301,7 @@ in
     sessionVariables = {
       TERMINAL = "alacritty";
       ZELLIJ_AUTO_EXIT = "true";
-      ZELLIJ_AUTO_ATTACH = "true";
+      ZELLIJ_AUTO_ATTACH = "false";
     };
 
     packages = with pkgs; [