[0.5.2] Improve autoscrolling