diff --git a/Hakawai/Mentions/HKWMentionsCreationStateMachine.m b/Hakawai/Mentions/HKWMentionsCreationStateMachine.m
index bd8c1d7..b74a262 100644
--- a/Hakawai/Mentions/HKWMentionsCreationStateMachine.m
+++ b/Hakawai/Mentions/HKWMentionsCreationStateMachine.m
@@ -855,7 +855,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     NSAssert(indexPath.row >= 0 && indexPath.row < [self.entityArray count],
              @"Entity chooser table view requested a cell with an out-of-bounds index path row.");
     id<HKWMentionsEntityProtocol> entity = self.entityArray[indexPath.row];
-    return [self.delegate cellForMentionsEntity:entity withMatchString:[self.stringBuffer copy] tableView:tableView];
+    return [self.delegate cellForMentionsEntity:entity withMatchString:[self.stringBuffer copy] tableView:tableView atIndexPath:indexPath];
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
diff --git a/Hakawai/Mentions/HKWMentionsPlugin.h b/Hakawai/Mentions/HKWMentionsPlugin.h
index 81c6b6d..8300028 100644
--- a/Hakawai/Mentions/HKWMentionsPlugin.h
+++ b/Hakawai/Mentions/HKWMentionsPlugin.h
@@ -198,7 +198,8 @@ typedef NS_ENUM(NSInteger, HKWMentionsPluginState) {
  */
 - (UITableViewCell *)cellForMentionsEntity:(id<HKWMentionsEntityProtocol>)entity
                            withMatchString:(NSString *)matchString
-                                 tableView:(UITableView *)tableView;
+                                 tableView:(UITableView *)tableView
+                               atIndexPath:(NSIndexPath *)indexPath;
 
 /*!
  Return the height of the table view cell for a given mention entity in the chooser view.
diff --git a/Hakawai/Mentions/HKWMentionsPlugin.m b/Hakawai/Mentions/HKWMentionsPlugin.m
index d1ab8ef..3f5d32c 100644
--- a/Hakawai/Mentions/HKWMentionsPlugin.m
+++ b/Hakawai/Mentions/HKWMentionsPlugin.m
@@ -1610,8 +1610,9 @@ - (void)asyncRetrieveEntitiesForKeyString:(NSString *)keyString
 
 - (UITableViewCell *)cellForMentionsEntity:(id<HKWMentionsEntityProtocol>)entity
                            withMatchString:(NSString *)matchString
-                                 tableView:(UITableView *)tableView {
-    return [self.delegate cellForMentionsEntity:entity withMatchString:matchString tableView:tableView];
+                                 tableView:(UITableView *)tableView
+                               atIndexPath:(NSIndexPath *)indexPath {
+    return [self.delegate cellForMentionsEntity:entity withMatchString:matchString tableView:tableView atIndexPath:indexPath];
 }
 
 - (CGFloat)heightForCellForMentionsEntity:(id<HKWMentionsEntityProtocol>)entity