Wrap key-events in a switch

Oppps forgot this