diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 6cc68eb..120d636 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -50,6 +50,9 @@ bind -n M-Down command-prompt -p ":split-window" "split-window %%"
 bind e new-window -n editor $EDITOR \; set-option -p remain-on-exit on
 bind r respawn-pane -k
 
+bind @ choose-window 'join-pane -vt "%%"'
+bind C-@ choose-window 'join-pane -ht "%%"'
+
 bind c new-window -c "#{pane_current_path}"
 bind | split-window -h -c "#{pane_current_path}"
 bind - split-window -v -c "#{pane_current_path}"