ISIS-692: removing flicker of choices drop-down