If selection is not empty, target it, ...

instead of still sticking to the current word.