[DF-1036] more changes - selection now retains while editing control's properties.