Adjust click to rename timing
A little more cleanup of click to rename behavior