diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index bff3e045ac020..b9481140c7213 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -9914,6 +9914,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                                     suggestionSpansFlags[i]);
                         }
                     }
+                    
+                    // Move cursor at the end of the replacement word
+                    Selection.setSelection(editable, spanEnd + lengthDifference);
                 }
             }
             hide();