diff --git a/names.c b/names.c
index 07c689d1..f437b53e 100644
--- a/names.c
+++ b/names.c
@@ -107,7 +107,7 @@ check_window_name(struct window *w)
 char *
 default_window_name(struct window *w)
 {
-	char    *cmd, *s;
+	char	*cmd, *s;
 
 	cmd = cmd_stringify_argv(w->active->argc, w->active->argv);
 	if (cmd != NULL && *cmd != '\0')
@@ -142,6 +142,10 @@ parse_window_name(const char *in)
 	char	*copy, *name, *ptr;
 
 	name = copy = xstrdup(in);
+	if (*name == '"')
+		name++;
+	name[strcspn (name, "\"")] = '\0';
+
 	if (strncmp(name, "exec ", (sizeof "exec ") - 1) == 0)
 		name = name + (sizeof "exec ") - 1;
 
diff --git a/tmux.1 b/tmux.1
index c2fecd9d..a39237d5 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1858,7 +1858,7 @@ The
 .Fl P
 option prints information about the new window after it has been created.
 By default, it uses the format
-.Ql #{session_name}:#{window_index}
+.Ql #{session_name}:#{window_index}.#{pane_index}
 but a different format may be specified with
 .Fl F .
 .It Xo Ic capture-pane