Better fix for Dropdown container options

Better fix for #3443 that does not break BC and allows widget to be extensible.