Keyboard navigation fix halfway