diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00860cd..fa949b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### master
 - update readme - write all keybindings
 - override default split window key bindings
+- Moving windows follows current window, compensate for change in behavior in
+  tmux 3.0
 
 ### v1.0.0, 2014-08-30
 - update readme to reflect github organization change
diff --git a/pain_control.tmux b/pain_control.tmux
index 9e68710..0ccb173 100755
--- a/pain_control.tmux
+++ b/pain_control.tmux
@@ -27,8 +27,8 @@ pane_navigation_bindings() {
 }
 
 window_move_bindings() {
-	tmux bind-key -r "<" swap-window -t -1
-	tmux bind-key -r ">" swap-window -t +1
+	tmux bind-key -r "<" swap-window -d -t -1
+	tmux bind-key -r ">" swap-window -d -t +1
 }
 
 pane_resizing_bindings() {