#8978: fixing dropdown issues