Custom commands dialog: Make sure the selected item is always visible

Always bring back the selected item after an user action, so the user
can see what she's doing.