Fix auto-scroll