Fix issue with excessive scrolling