Fix issue with scrolling to top on keyboard navigation