diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 233c198..de993a7 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -34,6 +34,9 @@ bind -n M-J swap-pane -D
 bind -n M-K swap-pane -U
 bind -n M-L swap-pane -D
 
+# Easily choose panes to move between windows
+bind-key @ choose-window 'join-pane -h -s "%%"'
+
 # Change the size of panes with <C-b><h/j/k/l>
 bind-key h resize-pane -L 5
 bind-key j resize-pane -D 5
@@ -52,6 +55,10 @@ bind -n M-n next-window
 bind -n S-Left  previous-window
 bind -n S-Right next-window
 
+# Easily move the current window to the left/right
+bind-key -n C-Left swap-window -t -1
+bind-key -n C-Right swap-window -t +1
+
 # Remove the delay when using the escape key
 set -sg escape-time 0