Fix issue with scrolling past end of screen