Fix keyboard control

Seems like a better approach to me