fixed #830 wonky scrolling
resolve merge conflict
Merge pull request #832 from waterbearlang/830_fix_scrolling

fixed #830 wonky scrolling