--- a/mobile/android/base/toolbar/ToolbarEditText.java
+++ b/mobile/android/base/toolbar/ToolbarEditText.java
@@ -387,16 +387,19 @@ public class ToolbarEditText extends Cus
                 // i.e. when the composing text is getting shorter.
                 if (composingStart >= 0 &&
                     composingEnd >= 0 &&
                     (composingEnd - composingStart) > text.length() &&
                     removeAutocomplete(editable)) {
                     // Make the IME aware that we interrupted the setComposingText call,
                     // by having finishComposingText() send change notifications to the IME.
                     finishComposingText();
+                    if (Build.VERSION.SDK_INT >= 9) {
+                        setComposingRegion(composingStart, composingEnd);
+                    }
                     return true;
                 }
                 return false;
             }
 
             @Override
             public boolean commitText(CharSequence text, int newCursorPosition) {
                 if (removeAutocompleteOnComposing(text)) {