GCP-7983 Fix Vertical Scrollbar