Fix non-polling scroll bug