Issue 2167: Don't add tag unless add tag button pressed