Issue 2167: Don't add tag unless add tag button pressed
Merge pull request #417 from timrae/issue2167

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