diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEffects.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEffects.java
index 5a61d9152..1172fa231 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEffects.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EditTextEffects.java
@@ -135,6 +135,9 @@ public class EditTextEffects extends EditText {
             Layout layout = getLayout();
             if (text instanceof Spannable && layout != null) {
                 int line = layout.getLineForOffset(start);
+                // NekoX: Fix official bug: Mention crash
+                if (start > layout.getText().length())
+                    return;
                 int x = (int) layout.getPrimaryHorizontal(start);
                 int y = (int) ((layout.getLineTop(line) + layout.getLineBottom(line)) / 2f);