Wrap in a switch
Merge pull request #3593 from guardian/key-events-hack

Wrap key-events in a switch