Fixed autoscroll issue

Fixed the autoscroll issue that was believed to be caused by
@mspensieri. His scrolling improvements should now be included.