Fixes #247 issue with continuous scrolling