GCP-6550 fix on double scroll bars