Fix scrolling out of limit items

Change-Id: I1753389a4ef6e95306a7de454eca8410a5185b45