1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index c82587b71..c7f90946d 100644
--- a/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -147,6 +147,13 @@ public class KeyboardSwitcher {
         if (!mKeyboards.containsKey(id)) {
             LatinKeyboard keyboard = new LatinKeyboard(
                 mContext, id.mXml, id.mMode);
+            if (id.mMode == KEYBOARDMODE_NORMAL
+                    || id.mMode == KEYBOARDMODE_URL
+                    || id.mMode == KEYBOARDMODE_IM
+                    || id.mMode == KEYBOARDMODE_EMAIL) {
+                keyboard.setExtension(R.xml.kbd_extension);
+            }
+
             if (id.mEnableShiftLock) {
                 keyboard.enableShiftLock();
             }