Fix keyboard shortcuts working with incorrect modifiers