Keep tag selected after rename
(cherry picked from commit b2adc6722325b2276805c12f7471bde54be8b2c4)