diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index bb42aab..aa4dfdc 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -84,17 +84,17 @@ bind -r P swap-window -d -t :-1
 bind -r \{ swap-pane -U
 bind -r \} swap-pane -D
 
-# Select windows with Alt-[0-9]
-bind -n M-1 select-window -t 1
-bind -n M-2 select-window -t 2
-bind -n M-3 select-window -t 3
-bind -n M-4 select-window -t 4
-bind -n M-5 select-window -t 5
-bind -n M-6 select-window -t 6
-bind -n M-7 select-window -t 7
-bind -n M-8 select-window -t 8
-bind -n M-9 select-window -t 9
-bind -n M-0 select-window -t 10
+# Select windows with Alt-[0-9], select last window if target is current
+bind -n M-1 select-window -T -t 1
+bind -n M-2 select-window -T -t 2
+bind -n M-3 select-window -T -t 3
+bind -n M-4 select-window -T -t 4
+bind -n M-5 select-window -T -t 5
+bind -n M-6 select-window -T -t 6
+bind -n M-7 select-window -T -t 7
+bind -n M-8 select-window -T -t 8
+bind -n M-9 select-window -T -t 9
+bind -n M-0 select-window -T -t 10
 
 # Vim-bindings