On short prompts, commands wider than the terminal do not reposition to start on their own line

Picks up issue #1121 with a relevant branch name and a bug fix