diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index f29a044..26a0ab3 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -86,8 +86,12 @@ 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'
 
-# 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"
+# Session and Pane selector
+bind T display-popup -E "tmux list-windows -a -F '#{session_name}:#{window_index} - #{window_name}' \
+	| grep -v \"^$(tmux display-message -p '#S')\$\" \
+	| fzf --reverse \
+	| sed -E 's/\s-.*$//' \
+	| xargs tmux switch-client -t"
 
 # Last command output
 set -g @command-capture-key t