Fix scrolling behaviour for good (?)