diff --git a/client/src/components/categorical/category.js b/client/src/components/categorical/category.js
index 7d53cff7..0a80f13a 100644
--- a/client/src/components/categorical/category.js
+++ b/client/src/components/categorical/category.js
@@ -86,7 +86,7 @@ class Category extends React.Component {
     const { dispatch, metadataField } = this.props;
     const { newLabelText } = this.state;
     /*
-    XXX TODO - temporary code generates random label string.   Remove
+    XXX TODO - temporary code generates random label string. Remove
     when the label creation UI is implemented.
 
     const { newLabelText } = this.state;
@@ -315,7 +315,10 @@ class Category extends React.Component {
                 <Dialog
                   icon="tag"
                   title="Add new label"
-                  isOpen={annotations.isAddingNewLabel}
+                  isOpen={
+                    annotations.isAddingNewLabel &&
+                    annotations.categoryAddingNewLabel === metadataField
+                  }
                   onClose={this.disableAddNewLabelMode}
                 >
                   <form
diff --git a/client/src/reducers/annotations.js b/client/src/reducers/annotations.js
index 09409b59..a47a44b8 100644
--- a/client/src/reducers/annotations.js
+++ b/client/src/reducers/annotations.js
@@ -6,6 +6,7 @@ const Annotations = (
     isEditingCategoryName: false,
     isEditingLabelName: false,
     categoryBeingEdited: false,
+    categoryAddingNewLabel: null,
     labelEditable: { category: null, label: null }
   },
   action