diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e755fa4a6398e4f9d7a9ad797d08550b4477a806..f810a656b27fa2c24b20dcd2abb1242d7665e6e9 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2266,6 +2266,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
         }
         initSuggest();
         loadSettings();
+        // Since we just changed languages, we should re-evaluate suggestions with whatever word
+        // we are currently composing. If we are not composing anything, we may want to display
+        // predictions or punctuation signs (which is done by updateBigramPredictions anyway).
+        if (isCursorTouchingWord()) {
+            mHandler.postUpdateSuggestions();
+        } else {
+            mHandler.postUpdateBigramPredictions();
+        }
     }
 
     public void hapticAndAudioFeedback(int primaryCode) {