Fix issue with "Next" keyboard button