No bug - Clean up in-progress shortcut key conditional
Merge pull request #284 from tojonmz/inprog-key-cleanup

No bug - Clean up in-progress shortcut key conditional