diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index 39b3aef..766f3f3 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -73,8 +73,13 @@ in
         }".source =
           cfg.icon;
       };
+
       extraOptions.programs.bash.initExtra = ''
-        [[ $WANT_BASH ]] || exec ${pkgs.fish}/bin/fish -l
+        if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+        then
+          shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+          exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+        fi
       '';
     };