Hotfix bug in keyboard shortcut handling