diff --git a/Hakawai/Core/HKWTextView.h b/Hakawai/Core/HKWTextView.h
index f61b220..c6e84bc 100644
--- a/Hakawai/Core/HKWTextView.h
+++ b/Hakawai/Core/HKWTextView.h
@@ -43,8 +43,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (BOOL) enableExperimentalDeadLockFix;
 + (BOOL) enableKoreanMentionsFix;
++ (BOOL) enableMentionSelectFix;
 + (void) setEnableExperimentalDeadLockFix:(BOOL)enabled;
 + (void) setEnableKoreanMentionsFix:(BOOL)enabled;
++ (void) setEnableMentionSelectFix:(BOOL)enabled;
 
 #pragma mark - Initialization
 
diff --git a/Hakawai/Core/HKWTextView.m b/Hakawai/Core/HKWTextView.m
index 0c7736c..13c559d 100644
--- a/Hakawai/Core/HKWTextView.m
+++ b/Hakawai/Core/HKWTextView.m
@@ -34,6 +34,7 @@ @interface HKWTextView () <UITextViewDelegate, HKWAbstractionLayerDelegate, NSTe
 
 static BOOL enableExperimentalDeadLockFix = NO;
 static BOOL enableKoreanMentionsFix = NO;
+static BOOL enableMentionSelectFix = NO;
 
 @implementation HKWTextView
 
@@ -51,6 +52,13 @@ + (void)setEnableKoreanMentionsFix:(BOOL)enabled {
     enableKoreanMentionsFix = enabled;
 }
 
++ (BOOL)enableMentionSelectFix {
+    return enableMentionSelectFix;
+}
++ (void)setEnableMentionSelectFix:(BOOL)enabled {
+    enableMentionSelectFix = enabled;
+}
+
 #pragma mark - Lifecycle
 
 - (instancetype _Nonnull)initWithFrame:(CGRect)frame textContainer:(nullable __unused NSTextContainer *)textContainer {
diff --git a/Hakawai/Mentions/HKWMentionsCreationStateMachine.m b/Hakawai/Mentions/HKWMentionsCreationStateMachine.m
index 5466117..0b6dd47 100644
--- a/Hakawai/Mentions/HKWMentionsCreationStateMachine.m
+++ b/Hakawai/Mentions/HKWMentionsCreationStateMachine.m
@@ -927,8 +927,15 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     mention.metadata = [entity entityMetadata];
     self.state = HKWMentionsCreationStateQuiescent;
     __strong __auto_type delegate = self.delegate;
-    [delegate createMention:mention startingLocation:self.startingLocation];
-    [delegate selected:entity atIndexPath:indexPath];
+
+    if (HKWTextView.enableMentionSelectFix) {
+        // Delegate selected callback should fire prior to creationMention which triggers textView callbacks
+        [delegate selected:entity atIndexPath:indexPath];
+        [delegate createMention:mention startingLocation:self.startingLocation];
+    } else {
+        [delegate createMention:mention startingLocation:self.startingLocation];
+        [delegate selected:entity atIndexPath:indexPath];
+    }
 }