Fix issue with new scrollbar setting