Fix issues when autoScrollEnabled is set to false