Move onscroll warning test

This moves it to the appropriate place to accomodate the move of the check.