@@ -608,7 +608,7 @@ private void NoInliningConstructor()
 
             browserSettings = Core.ObjectFactory.CreateBrowserSettings(autoDispose: true);
 
-            WpfKeyboardHandler = new WpfKeyboardHandler(this);
+            SetupWpfKeyboardHandler();
 
             PresentationSource.AddSourceChangedHandler(this, PresentationSourceChangedHandler);
 
@@ -753,6 +753,13 @@ private void InternalDispose(bool disposing)
                 // is called.
                 LifeSpanHandler = null;
 
+                var inputLangManager = InputLanguageManager.Current;
+
+                if (inputLangManager != null)
+                { 
+                    inputLangManager.InputLanguageChanged -= OnInputLangageChanged;
+                }
+
                 WpfKeyboardHandler?.Dispose();
                 WpfKeyboardHandler = null;
 
@@ -769,6 +776,32 @@ private void InternalDispose(bool disposing)
             Cef.RemoveDisposable(this);
         }
 
+        private void SetupWpfKeyboardHandler()
+        {
+            try
+            {
+                var inputLang = InputLanguageManager.Current.CurrentInputLanguage;
+
+                var useImeKeyboardHandler = WpfImeKeyboardHandler.UseImeKeyboardHandler(inputLang.KeyboardLayoutId);
+
+                if (useImeKeyboardHandler)
+                {
+                    WpfKeyboardHandler = new WpfImeKeyboardHandler(this);
+                }
+                else
+                {
+                    InputLanguageManager.Current.InputLanguageChanged += OnInputLangageChanged;
+
+                    WpfKeyboardHandler = new WpfKeyboardHandler(this);
+                }
+            }
+            catch (Exception)
+            {
+                // For now we'll ignore any errors and just use the default keyboard handler
+                WpfKeyboardHandler = new WpfKeyboardHandler(this);
+            }
+        }
+
         /// <summary>
         /// Gets the ScreenInfo - currently used to get the DPI scale factor.
         /// </summary>
@@ -1719,6 +1752,26 @@ private void OnDragEnter(object sender, DragEventArgs e)
             }
         }
 
+        private void OnInputLangageChanged(object sender, InputLanguageEventArgs e)
+        {
+            // If we are already using the WpfImeKeyboardHandler then we'll ignore any changes
+            if (WpfKeyboardHandler?.GetType() == typeof(WpfImeKeyboardHandler))
+            {
+                return;
+            }
+
+            var useImeKeyboardHandler = WpfImeKeyboardHandler.UseImeKeyboardHandler(e.NewLanguage.KeyboardLayoutId);
+
+            if (useImeKeyboardHandler)
+            {
+                var oldKeyboardHandler = WpfKeyboardHandler;
+                WpfKeyboardHandler = new WpfImeKeyboardHandler(this);
+                oldKeyboardHandler?.Dispose();                
+
+                InputLanguageManager.Current.InputLanguageChanged -= OnInputLangageChanged;
+            }
+        }
+
         /// <summary>
         /// PresentationSource changed handler.
         /// </summary>
 
@@ -346,7 +346,7 @@ private void CreateImeWindow(IntPtr hwnd)
             }
         }
 
-        private int PrimaryLangId(int lgid)
+        private static int PrimaryLangId(int lgid)
         {
             return lgid & 0x3ff;
         }
@@ -440,5 +440,25 @@ private void UpdateCaretPosition(int index)
         {
             MoveImeWindow(source.Handle);
         }
+
+        /// <summary>
+        /// Based on the <paramref name="keyboardLayoutId"/> determine if we
+        /// should be using IME.
+        /// </summary>
+        /// <param name="keyboardLayoutId">Keyboard Layout Id (obtained from <see cref="System.Globalization.CultureInfo.KeyboardLayoutId"/></param>
+        /// <returns>
+        /// returns true if the keyboard layout matches one of our listed that support IME, otherwise false.
+        /// </returns>
+        public static bool UseImeKeyboardHandler(int keyboardLayoutId)
+        {
+            var langId = PrimaryLangId(keyboardLayoutId);
+
+            if (langId == ImeNative.LANG_KOREAN || langId == ImeNative.LANG_JAPANESE || langId == ImeNative.LANG_CHINESE)
+            {
+                return true;
+            }
+
+            return false;
+        }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ private void CreateImeWindow(IntPtr hwnd)`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`
`349`		`- private int PrimaryLangId(int lgid)`
	`349`	`+ private static int PrimaryLangId(int lgid)`
`350`	`350`	`{`
`351`	`351`	`return lgid & 0x3ff;`
`352`	`352`	`}`
`@@ -440,5 +440,25 @@ private void UpdateCaretPosition(int index)`
`440`	`440`	`{`
`441`	`441`	`MoveImeWindow(source.Handle);`
`442`	`442`	`}`
	`443`	`+`
	`444`	`+ /// <summary>`
	`445`	`+ /// Based on the <paramref name="keyboardLayoutId"/> determine if we`
	`446`	`+ /// should be using IME.`
	`447`	`+ /// </summary>`
	`448`	`+ /// <param name="keyboardLayoutId">Keyboard Layout Id (obtained from <see cref="System.Globalization.CultureInfo.KeyboardLayoutId"/></param>`
	`449`	`+ /// <returns>`
	`450`	`+ /// returns true if the keyboard layout matches one of our listed that support IME, otherwise false.`
	`451`	`+ /// </returns>`
	`452`	`+ public static bool UseImeKeyboardHandler(int keyboardLayoutId)`
	`453`	`+ {`
	`454`	`+ var langId = PrimaryLangId(keyboardLayoutId);`
	`455`	`+`
	`456`	`+ if (langId == ImeNative.LANG_KOREAN \|\| langId == ImeNative.LANG_JAPANESE \|\| langId == ImeNative.LANG_CHINESE)`
	`457`	`+ {`
	`458`	`+ return true;`
	`459`	`+ }`
	`460`	`+`
	`461`	`+ return false;`
	`462`	`+ }`
`443`	`463`	`}`
`444`	`464`	`}`