Fix scrolling bug

For this task:
https://www.google-melange.com/gci/task/view/google/gci2014/5281967121629184