Changed Keylistener handling