diff --git a/tmux.conf b/tmux.conf
index ad6029d..652e082 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -12,12 +12,11 @@ bind w select-pane -U
 bind r select-pane -D
 
 #window management
-bind Q new-window -n '%%'
+bind Q command-prompt -I "" "new-window -n '%%'"
 bind A next-window
 bind S previous-window
 bind W last-window
-bind R rename-window -n '%%'
-bind F find-window -n '%%'
+bind R command-prompt -I "#W" "rename-window -n '%%'"
 
 #promote/demote pane
 bind z resize-pane -Z