diff --git a/src/components/tags/TagAutocomplete/index.tsx b/src/components/tags/TagAutocomplete/index.tsx
index fc69c6ab..485a6fe1 100644
--- a/src/components/tags/TagAutocomplete/index.tsx
+++ b/src/components/tags/TagAutocomplete/index.tsx
@@ -109,10 +109,21 @@ const TagAutocompleteUnconnected: FC<Props> = ({
       {...pop.attributes.popper}
     >
       <div className={styles.scroll} ref={scroll}>
-        <TagAutocompleteRow selected={selected === -1} title={search} type="enter" />
+        <TagAutocompleteRow
+          selected={selected === -1}
+          title={search}
+          type="enter"
+          onSelect={onSelect}
+        />
 
         {categories.map((item, i) => (
-          <TagAutocompleteRow selected={selected === i} title={item} type="right" key={item} />
+          <TagAutocompleteRow
+            selected={selected === i}
+            title={item}
+            type="right"
+            key={item}
+            onSelect={onSelect}
+          />
         ))}
 
         {tags.map((item, i) => (
@@ -121,6 +132,7 @@ const TagAutocompleteUnconnected: FC<Props> = ({
             title={item}
             type="tag"
             key={item}
+            onSelect={onSelect}
           />
         ))}
       </div>
diff --git a/src/components/tags/TagAutocompleteRow/index.tsx b/src/components/tags/TagAutocompleteRow/index.tsx
index 0340bd3d..27e8b282 100644
--- a/src/components/tags/TagAutocompleteRow/index.tsx
+++ b/src/components/tags/TagAutocompleteRow/index.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React, { FC, useCallback } from 'react';
 import styles from './styles.module.scss';
 import classNames from 'classnames';
 import { Icon } from '~/components/input/Icon';
@@ -7,13 +7,21 @@ interface IProps {
   selected: boolean;
   title: string;
   type: string;
+  onSelect: (val: string) => void;
 }
 
-const TagAutocompleteRow: FC<IProps> = ({ selected, type, title }) => (
-  <div className={classNames(styles.row, styles[type], { [styles.selected]: selected })}>
-    <Icon icon={type} size={16} />
-    <span>{title}</span>
-  </div>
-);
+const TagAutocompleteRow: FC<IProps> = ({ selected, type, title, onSelect }) => {
+  const onClick = useCallback(() => onSelect(title), [title, onSelect]);
+
+  return (
+    <div
+      className={classNames(styles.row, styles[type], { [styles.selected]: selected })}
+      onClick={onClick}
+    >
+      <Icon icon={type} size={16} />
+      <span>{title}</span>
+    </div>
+  );
+};
 
 export { TagAutocompleteRow };