diff --git a/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java b/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java
index 66c4b68995572..12b522bb98f22 100644
--- a/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java
+++ b/core/java/com/android/internal/inputmethod/RemoteInputConnectionImpl.java
@@ -1065,7 +1065,11 @@ public final class RemoteInputConnectionImpl extends IInputContext.Stub {
                     Log.w(TAG, "commitText on inactive InputConnection");
                     return;
                 }
+                // A11yIME's commitText() also triggers finishComposingText() automatically.
+                ic.beginBatchEdit();
+                ic.finishComposingText();
                 ic.commitText(text, newCursorPosition, textAttribute);
+                ic.endBatchEdit();
             });
         }