Fixes #1017: Startup key stuck display

Closes #1017