No bug - Clean up in-progress shortcut key conditional