FLEX-33879 fix scrolling issue