diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx
index 3b3a0040ac7..ae33397d8ea 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx
@@ -104,9 +104,7 @@ class SelectTargetsDropdown extends Component {
 
       const currentMoreInfoTarget = this.state.moreInfoTarget || {};
 
-      if (
-        isEqual(moreInfoTarget.display_text, currentMoreInfoTarget.display_text)
-      ) {
+      if (isEqual(moreInfoTarget.id, currentMoreInfoTarget.id)) {
         return false;
       }
 
diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx
index 6769fde10b8..09ca67557dc 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsInput/SelectTargetsInput.jsx
@@ -73,7 +73,7 @@ class SelectTargetsInput extends Component {
         scrollMenuIntoView={false}
         tabSelectsValue={false}
         value={selectedTargets}
-        valueKey="display_text"
+        valueKey="id"
       />
     );
   }
diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx
index 5b2ee169887..43c9a974163 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsMenu/SelectTargetsMenu.jsx
@@ -79,7 +79,7 @@ const SelectTargetsMenuWrapper = (
               isDisabled={isDisabled}
               isFocused={isFocused}
               isSelected={isSelected}
-              key={`option-${target[valueKey]}`}
+              key={`option-${target[valueKey]}-${target.id}`}
               onFocus={onFocus}
               onSelect={noop}
               option={target}