diff --git a/ui/src/shared/components/inlineLabels/InlineLabelsEditor.tsx b/ui/src/shared/components/inlineLabels/InlineLabelsEditor.tsx
index 6de930b46c..1fb7ae7d93 100644
--- a/ui/src/shared/components/inlineLabels/InlineLabelsEditor.tsx
+++ b/ui/src/shared/components/inlineLabels/InlineLabelsEditor.tsx
@@ -164,7 +164,11 @@ class InlineLabelsEditor extends Component<Props, State> {
     const {availableLabels} = this
     const {isPopoverVisible} = this.state
 
-    if (_.isEmpty(availableLabels) && !isPopoverVisible) {
+    if (_.isEmpty(availableLabels)) {
+      if (isPopoverVisible) {
+        return
+      }
+
       return this.setState({
         isPopoverVisible: true,
         selectedItemID: null,