This is a very important patch that vastly improves the UX of yayhooray for me

@castis please review :bee: