Better keyboard input beahviour