diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 7f410aa9addaf..d8aaa19ff8864 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -9555,6 +9555,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             public void dismiss() {
                 super.dismiss();
 
+                TextView.this.getPositionListener().removeSubscriber(SuggestionsPopupWindow.this);
+
                 if ((mText instanceof Editable) && mSuggestionRangeSpan != null) {
                     ((Editable) mText).removeSpan(mSuggestionRangeSpan);
                 }