Fix issue with grid overscroll