diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDefinition.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDefinition.java
index c9458dfbd7..2153b35522 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDefinition.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDefinition.java
@@ -180,7 +180,7 @@ final class TagNameDefinition implements Comparable<TagNameDefinition> {
     private TagName saveToCase(SleuthkitCase caseDb) {
         TagName tagName = null;
         try {
-            tagName = caseDb.addTagName(displayName, description, color, knownStatus);
+            tagName = caseDb.addOrUpdateTagName(displayName, description, color, knownStatus);
         } catch (TskCoreException ex) {
             Exceptions.printStackTrace(ex);
         }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java
index c8d1351763..f923717760 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java
@@ -135,10 +135,9 @@ final class TagNameDialog extends javax.swing.JDialog {
                         NbBundle.getMessage(TagNameDialog.class, "TagNameDialog.JOptionPane.tagNameEmpty.title"),
                         JOptionPane.ERROR_MESSAGE);
                 return;
-            }        
+            }
             //if a tag name contains illegal characters and is not the name of one of the standard tags
             if (TagsManager.containsIllegalCharacters(newTagDisplayName) && !TagNameDefinition.getStandardTagNames().contains(newTagDisplayName)) {
-
                 JOptionPane.showMessageDialog(null,
                         NbBundle.getMessage(TagNameDialog.class, "TagNameDialog.JOptionPane.tagNameIllegalCharacters.message"),
                         NbBundle.getMessage(TagNameDialog.class, "TagNameDialog.JOptionPane.tagNameIllegalCharacters.title"),
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
index 5699034f7b..de16d9456f 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java
@@ -255,7 +255,7 @@ public class TagsManager implements Closeable {
      */
     public synchronized TagName addTagName(String displayName, String description, TagName.HTML_COLOR color, TskData.FileKnown knownStatus) throws TagNameAlreadyExistsException, TskCoreException {
         try {
-            TagName tagName = caseDb.addTagName(displayName, description, color, knownStatus);
+            TagName tagName = caseDb.addOrUpdateTagName(displayName, description, color, knownStatus);
             Set<TagNameDefinition> customTypes = TagNameDefinition.getTagNameDefinitions();
             customTypes.add(new TagNameDefinition(displayName, description, color, knownStatus));
             TagNameDefinition.setTagNameDefinitions(customTypes);