diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 427b35723..0779964af 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -188,8 +188,13 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
 
         public void save() {
             mIsAlphabetMode = isAlphabetMode();
-            mIsShiftLocked = mIsAlphabetMode && isShiftLocked();
-            mIsShifted = !mIsShiftLocked && isShiftedOrShiftLocked();
+            if (mIsAlphabetMode) {
+                mIsShiftLocked = isShiftLocked();
+                mIsShifted = !mIsShiftLocked && isShiftedOrShiftLocked();
+            } else {
+                mIsShiftLocked = false;
+                mIsShifted = mSymbolsShiftedKeyboardId.equals(mCurrentId);
+            }
             mIsValid = true;
         }
 
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index d00ce78e1..cbfc90017 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -115,7 +115,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
 
     private static final int SCREEN_ORIENTATION_CHANGE_DETECTION_DELAY = 2;
     private static final int ACCUMULATE_START_INPUT_VIEW_DELAY = 20;
-    private static final int RESTORE_KEYBOARD_STATE_DELAY = 200;
+    private static final int RESTORE_KEYBOARD_STATE_DELAY = 300;
 
     /**
      * The name of the scheme used by the Package Manager to warn of a new package installation,