Fixed annoying behaviour when scrolling