diff --git a/ansible/roles/tmux/files/tmux/tmux.conf b/ansible/roles/tmux/files/tmux/tmux.conf
index b983178..a1fb664 100644
--- a/ansible/roles/tmux/files/tmux/tmux.conf
+++ b/ansible/roles/tmux/files/tmux/tmux.conf
@@ -9,6 +9,9 @@ set -g base-index 1
 # Start panes at index 1 instead of 0
 set -g pane-base-index 1
 
+# Ensures that panes get reordered correctly when killing panes
+set-option -g renumber-windows on
+
 # VI-mode
 set-window-option -g mode-keys vi
 set-window-option -g status-keys vi