Patch Set 1: I would prefer that you didn't submit this; IP review completed

We need the same fix in CreateTagCommand. Much better would be to move that logic into the dialog where it belongs (let's follow up on this in  bug 323607).