diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index b02de9a4aa1716205138d978553db8bf658b3b62..2d388e1803f445bc876b7e1fa617112a2aedcc56 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -166,6 +166,8 @@ public class Suggest {
     public SuggestedWords getSuggestedWords(
             final WordComposer wordComposer, CharSequence prevWordForBigram,
             final ProximityInfo proximityInfo, final boolean isCorrectionEnabled,
+            // TODO: remove isPrediction parameter. It effectively means the same thing
+            // as wordComposer.size() <= 1
             final boolean isPrediction) {
         LatinImeLogger.onStartSuggestion(prevWordForBigram);
         final boolean isFirstCharCapitalized =
@@ -261,7 +263,7 @@ public class Suggest {
             LatinImeLogger.onAddSuggestedWord(wordInfo.mWord.toString(), wordInfo.mSourceDict);
         }
 
-        if (!isPrediction) {
+        if (!TextUtils.isEmpty(typedWord)) {
             suggestionsContainer.add(0, new SuggestedWordInfo(typedWord,
                     SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_TYPED,
                     Dictionary.TYPE_USER_TYPED));