diff --git a/bin/t b/bin/t
index 7d589acc..2a0b2e8f 100755
--- a/bin/t
+++ b/bin/t
@@ -53,7 +53,10 @@ if tmux has-session -t "${session_name}" 2> /dev/null; then
 fi
 
 # If a .tmux file exists, run it with the generated session name and path.
-if [[ -e "${session_path}/.tmux" ]]; then
+if [[ -e "${session_path}/.tmuxinator.yml" ]]; then
+  cd "${session_path}" && tmuxinator start
+  exit
+elif [[ -e "${session_path}/.tmux" ]]; then
   "${session_path}/.tmux" "${session_name}" "${session_path}"
   exit
 elif [[ -e "${session_path}/.ignored/.tmux" ]]; then
diff --git a/lib/shared/modules/tmux.nix b/lib/shared/modules/tmux.nix
index 6d5e0e75..72d7b4fd 100644
--- a/lib/shared/modules/tmux.nix
+++ b/lib/shared/modules/tmux.nix
@@ -4,6 +4,8 @@ in {
   programs.tmux = {
     enable = true;
 
+    tmuxinator.enable = true;
+
     terminal = "tmux-256color";
 
     extraConfig = ''