Fixed autoscroll issue

Fixed the autoscroll issue that was believed to be caused by
@mspensieri. This should clear up the problem preventing his scrolling improvements from being included.