fix(core): avoid dangling selector controls

fix(core): avoid dangling selector controls #4370