Fix for viewport shift-scrolling