diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 737bd0d..a99f0b4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -803,7 +803,8 @@
         // create new display context and re-init keyboard layout with this context.
         final WindowManager wm = getSystemService(WindowManager.class);
         final int newDisplayId = wm.getDefaultDisplay().getDisplayId();
-        if (mCurDisplayId != newDisplayId) {
+        if (mCurDisplayId != newDisplayId || !mDisplayContext.getResources().getConfiguration()
+                        .equals(getResources().getConfiguration())) {
             mCurDisplayId = newDisplayId;
             mDisplayContext = createDisplayContext(wm.getDefaultDisplay());
             mKeyboardSwitcher.updateKeyboardTheme(mDisplayContext);
