[bug 942440] Fixes scrolling Issue

Fixes the issues of double scrolling bar, that comes with #512