Modified Keyboard Handler behaviour