diff --git a/frontend/src/components/common/AutoCompletePicker/AutoCompletePicker.tsx b/frontend/src/components/common/AutoCompletePicker/AutoCompletePicker.tsx
index 8c5be589e..f8eec38ec 100644
--- a/frontend/src/components/common/AutoCompletePicker/AutoCompletePicker.tsx
+++ b/frontend/src/components/common/AutoCompletePicker/AutoCompletePicker.tsx
@@ -189,7 +189,6 @@ export default function AutoCompletePicker(props: AutoCompletePickerProps) {
   const classes = useStyles();
 
   function onInputChange(event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) {
-    setSelectedValue(event.target.value);
     props.onValueChanged(event.target.value);
   }
 
@@ -234,6 +233,8 @@ export default function AutoCompletePicker(props: AutoCompletePickerProps) {
               inputValue,
               selectedItem,
             }) => {
+              setSelectedValue(selectedItem);
+
               const { onBlur, onFocus, ...inputProps } = getInputProps();
 
               return (