[BUG #6609] Fixed scrolling