added scroll bar fallback to wrong container
added scroll bar fallback to wrong container

RayRutjes/frontend,prathamesh-sonpatki/frontend,RayRutjes/frontend,circleci/frontend,circleci/frontend,prathamesh-sonpatki/frontend,circleci/frontend