diff --git a/debian/changelog b/debian/changelog
index 65014319..c113a38d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 byobu (5.131) unreleased; urgency=medium
 
+  [ Dustin Kirkland ]
   * debian/control: Closes: #949941
     - build-depend on python3-pep8, rather than pep8 transitional package
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 09 Feb 2020 10:06:01 -0600
+  [ Chris Coulson ]
+  * usr/share/byobu/keybindings/f-keys.tmux: LP: #1861555
+    - Update usage of tmux swap-window so that focus stays with the
+      original window.
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 09 Feb 2020 10:25:20 -0600
 
 byobu (5.130-0ubuntu1) focal; urgency=medium
 
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index eabacf87..6a56aa89 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -46,8 +46,8 @@ bind-key -n S-Left display-panes \; select-pane -L
 bind-key -n S-Right display-panes \; select-pane -R
 bind-key -n C-F3 display-panes \; swap-pane -s :. -t :.- \; select-pane -t :.-
 bind-key -n C-F4 display-panes \; swap-pane -s :. -t :.+ \; select-pane -t :.+
-bind-key -n C-S-F3 swap-window -t :-1
-bind-key -n C-S-F4 swap-window -t :+1
+bind-key -n C-S-F3 swap-window -t :-1 -d
+bind-key -n C-S-F4 swap-window -t :+1 -d
 bind-key -n M-S-Up resize-pane -U
 bind-key -n M-S-Down resize-pane -D
 bind-key -n M-S-Left resize-pane -L