BS-8194, fix scrollbar (BS-9058) and BS-9064