[WIP] Fix a text selection problem

Keep selection on adder button

Fixes #1598.