diff --git a/src/components/room/MentionPopover.tsx b/src/components/room/MentionPopover.tsx
index 9922d8c..896ca96 100644
--- a/src/components/room/MentionPopover.tsx
+++ b/src/components/room/MentionPopover.tsx
@@ -401,7 +401,7 @@ export function MentionPopover({
         if (!item) return;
         e.preventDefault();
         if (item.type === 'category') onCategoryEnterRef.current(item.category!);
-        else handleSelectRef.current();
+        else handleSelectRef.current(item);
       } else if (e.key === 'Escape') {
         e.preventDefault();
         closePopoverRef.current();
@@ -473,13 +473,17 @@ export function MentionPopover({
         <ScrollArea className="max-h-80">
           <div className="py-1">
             {suggestions.map((s, i) => s.type === 'category' ? (
-              <CategoryHeader key={s.label + i} suggestion={s} isSelected={i === selectedIndex} />
+              <div key={s.label}>
+                <CategoryHeader suggestion={s} isSelected={i === selectedIndex} />
+              </div>
             ) : (
-              <div ref={el => { itemsRef.current[i] = el; }}>
-                <SuggestionItem key={s.mentionId || s.label + i} suggestion={s} isSelected={i === selectedIndex}
+              <div key={s.mentionId || s.label} ref={el => { itemsRef.current[i] = el; }}>
+                <SuggestionItem
+                  suggestion={s} isSelected={i === selectedIndex}
                   onSelect={() => doInsert(s)}
                   onMouseEnter={() => { setSelectedIndex(i); selectedIndexRef.current = i; }}
-                  searchTerm={mentionState.item} />
+                  searchTerm={mentionState.item}
+                />
               </div>
             ))}
           </div>