better handling of selection focus