Fixed option selector ‘user-initiated’ functionality