diff --git a/home/applications/foot/default.nix b/home/applications/foot/default.nix
index a6330ba..a73955d 100644
--- a/home/applications/foot/default.nix
+++ b/home/applications/foot/default.nix
@@ -1,9 +1,11 @@
+{ lib, pkgs, ... }:
 {
   programs.foot = {
     enable = true;
     settings = {
       main.font = "monospace:size=10";
       main.resize-by-cells = false;
+      main.shell = "${lib.getExe pkgs.tmux} new-session -t main";
       cursor.style = "beam";
       url.label-letters = "aoeuhtns";
     } // import ./tokyonight_night.nix;
diff --git a/home/applications/tmux/default.nix b/home/applications/tmux/default.nix
index 0d3729c..6ed5e5f 100644
--- a/home/applications/tmux/default.nix
+++ b/home/applications/tmux/default.nix
@@ -11,11 +11,12 @@
     set-option -w -g pane-base-index   1
     set-option    -g renumber-windows  on
 
-    set-option    -g status-keys       vi
-    set-option -w -g mode-keys         vi
-    set-option    -g mouse             on
-    set-option    -s set-clipboard     on
-    set-option -w -g aggressive-resize on
+    set-option    -g status-keys        vi
+    set-option -w -g mode-keys          vi
+    set-option    -g mouse              on
+    set-option    -s set-clipboard      on
+    set-option -w -g aggressive-resize  on
+    set-option    -g destroy-unattached keep-last
 
     set-option    -g status-style "bg=black"
     set-option    -g status-left  ""