diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index b9541b7..63d43dd 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -86,9 +86,11 @@ bind -T copy-mode-vi v send-keys -X begin-selection
 bind -T copy-mode-vi y send-keys -X copy-selection
 bind -T copy-mode-vi r send-keys -X rectangle-toggle
 
+# Save scrollback buffer to a file
 bind S command-prompt -p 'Save history to filename:' -I '/tmp/tmux.history' 'capture-pane -S - -E -; save-buffer %1 ; delete-buffer'
 
-bind T choose-tree -wZ
+# Session selector
+bind T display-popup -E "tmux list-sessions | sed -E 's/:.*$//' | grep -v \"^$(tmux display-message -p '#S')\$\" | fzf --reverse | xargs tmux switch-client -t"
 
 # This effects color rendering and typing on terminal.
 set-option -g default-terminal "tmux-256color"