Make auto-scroll behavior optional