FORGE-1256: Fixed ComboBox recursion problem