Fixed autoscrolling behaviour on state transitions