Further improved auto-scroll handling