1 files changed, 7 insertions, 4 deletions
diff --git a/src/utils/comments.tsx b/src/utils/comments.tsx
index 910b44e7..28879622 100644
--- a/src/utils/comments.tsx
+++ b/src/utils/comments.tsx
@@ -79,13 +79,16 @@ export const renderTextWithMentions: React.FC<RenderProps> = ({
   );
 };
 
-export const mentionPartTypes: (theme: 'blue' | 'white') => PartType[] = (
-  theme,
-) => {
+export const mentionPartTypes: (
+  theme: 'blue' | 'white',
+  component: 'caption' | 'comment',
+) => PartType[] = (theme, component) => {
   return [
     {
       trigger: '@',
-      renderSuggestions: (props) => <TaggTypeahead {...props} />,
+      renderSuggestions: (props) => (
+        <TaggTypeahead component={component} {...props} />
+      ),
       allowedSpacesCount: 0,
       isInsertSpaceAfterMention: true,
       textStyle: _textStyle(theme),