SW-7626 - Fix scrolling error