Fix scrollbar issues introduced by previous commit