diff --git a/modules/shell/tmux.nix b/modules/shell/tmux.nix
index 0b3edfc..0339c70 100644
--- a/modules/shell/tmux.nix
+++ b/modules/shell/tmux.nix
@@ -9,7 +9,7 @@
     tmux = {
       enable = true;
       terminal = "xterm-256color";
-      newSession = true;
+      newSession = false;
       keyMode = "vi";
       historyLimit = 10000;
       clock24 = true;
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
index 325e757..fd1c6da 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -22,7 +22,7 @@
       initExtraFirst = ''                            # very first inits in zshrc
         if [[ $DISPLAY ]]; then
             [[ $- != *i* ]] && return
-           tmux attach
+            [[ -z "$TMUX" ]] && (tmux attach || tmux new-session)
         fi
       '';