diff --git a/debian/changelog b/debian/changelog
index ad8cd68b..20af97ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ byobu (5.46) unreleased; urgency=low
   * usr/bin/byobu: LP: #1173354
     - if tput colors is 256, use screen-256color in byobu-screen
 
+  [ Dustin Kirkland ]
+  * usr/share/byobu/keybindings/f-keys.tmux: LP: #1190290
+    - handle spaces in windows and layouts properly
+
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 15 Jul 2013 15:52:56 -0500
 
 byobu (5.45-0ubuntu1) saucy; urgency=low
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index bc4a57e4..516f9655 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -64,10 +64,10 @@ 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)" "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 %%'"
+bind-key -n C-S-F8 command-prompt -p "Save byobu layout as:" "run-shell \"byobu-layout save '%%'\""
 bind-key -n F9 new-window -k -n config byobu-config
 bind-key -n M-F11 break-pane
 bind-key -n C-F11 join-pane -h -s :. -t :-1