Shortcut view: Fix "selection in selection" graphical bug when renaming shortcut

This partly reverts the previous commit which was not correct,
and fixes the real problem which can be seen when cancelling editing.