diff --git a/key-string.c b/key-string.c
index a97827f8..8258382b 100644
--- a/key-string.c
+++ b/key-string.c
@@ -277,7 +277,6 @@ key_string_lookup_string(const char *string)
 		}
 		free(udp);
 		return (uc);
-
 	}
 
 	/* Check for short Ctrl key. */
diff --git a/status.c b/status.c
index 9096dbec..e24c64cf 100644
--- a/status.c
+++ b/status.c
@@ -607,6 +607,8 @@ status_prompt_set(struct client *c, struct cmd_find_state *fs,
 	struct format_tree	*ft;
 	char			*tmp;
 
+	server_client_clear_overlay(c);
+
 	if (fs != NULL)
 		ft = format_create_from_state(NULL, c, fs);
 	else
diff --git a/tmux.1 b/tmux.1
index 11ea5504..6de9033f 100644
--- a/tmux.1
+++ b/tmux.1
@@ -4491,9 +4491,9 @@ Set the character used to fill areas of the terminal unused by a window.
 .It Ic main-pane-height Ar height
 .It Ic main-pane-width Ar width
 Set the width or height of the main (left or top) pane in the
-.Ic main-horizontal,
-.Ic main-horizontal-mirrored,
-.Ic main-vertical,
+.Ic main-horizontal ,
+.Ic main-horizontal-mirrored ,
+.Ic main-vertical ,
 or
 .Ic main-vertical-mirrored
 layouts.