Fix bug between keyboard and mouse navigations