diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/CharSequenceUtil.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/CharSequenceUtil.java
index 43b8d04379..d3ad56a227 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/CharSequenceUtil.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/CharSequenceUtil.java
@@ -49,6 +49,9 @@ public final class CharSequenceUtil {
         String expectedCharsString = expectedChars.toString();
         String currentContextString = currentContext.toString();
         int index = expectedCharsString.lastIndexOf(currentContextString);
+        if (currentContextString.length() == 0) {
+          index = 0;
+        }
         if (index > -1) {
           // subSequence indices are start(inclusive) to end(exclusive)
           charsToRestore = expectedChars.subSequence(index + currentContextString.length(), expectedChars.length());