diff --git a/debian/changelog b/debian/changelog
index 016dfb79..7fce0d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ byobu (5.58) unreleased; urgency=low
     - byobu-tmux had never quite implemented this
     - Add a new keybinding to both byobu-screen and byobu-tmux that adds
       this support, Shift-F9
+  * usr/share/byobu/keybindings/f-keys.tmux: LP: #1224352
+    - show current window name when prompting for rename-window
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 03 Sep 2013 14:40:09 -0500
 
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index c1584cc0..842d806d 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -64,7 +64,7 @@ bind-key -n C-F6 kill-pane
 bind-key -n F7 copy-mode
 bind-key -n M-NPage copy-mode \; send-keys NPage
 bind-key -n M-PPage copy-mode \; send-keys PPage
-bind-key -n F8 command-prompt -p "(rename-window)" "rename-window '%%'"
+bind-key -n F8 command-prompt -p "(rename-window)" -I "#W" "rename-window '%%'"
 bind-key -n S-F8 next-layout
 bind-key -n C-F8 new-window -k "byobu-layout restore; clear; $SHELL"
 bind-key -n C-S-F8 command-prompt -p "Save byobu layout as:" "run-shell \"byobu-layout save '%%'\""