DAR-1700: Fixed for double scrollbar on desktops