diff --git a/Wox.Core/Resource/Internationalization.cs b/Wox.Core/Resource/Internationalization.cs
index 9f865cb53..53cce9174 100644
--- a/Wox.Core/Resource/Internationalization.cs
+++ b/Wox.Core/Resource/Internationalization.cs
@@ -99,6 +99,22 @@ namespace Wox.Core.Resource
 
         }
 
+        public bool PromptShouldUsePinyin(string languageCodeToSet)
+        {
+            var languageToSet = GetLanguageByLanguageCode(languageCodeToSet);
+
+            if (Settings.ShouldUsePinyin)
+                return false;
+
+            if (languageToSet != AvailableLanguages.Chinese && languageToSet != AvailableLanguages.Chinese_TW)
+                return false;
+
+            if (MessageBox.Show("Do you want to turn on search with Pinyin?", string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+                return false;
+
+            return true;
+        }
+
         private void RemoveOldLanguageFiles()
         {
             var dicts = Application.Current.Resources.MergedDictionaries;
diff --git a/Wox.Infrastructure/Alphabet.cs b/Wox.Infrastructure/Alphabet.cs
index 487c0a4b0..4754394cb 100644
--- a/Wox.Infrastructure/Alphabet.cs
+++ b/Wox.Infrastructure/Alphabet.cs
@@ -162,7 +162,7 @@ namespace Wox.Infrastructure
 
             if (word.Length > 40)
             {
-                Log.Debug($"|Wox.Infrastructure.StringMatcher.ScoreForPinyin|skip too long string: {word}");
+                //Skip strings that are too long string for Pinyin conversion.
                 return false;
             }
 
diff --git a/Wox.Infrastructure/UserSettings/Settings.cs b/Wox.Infrastructure/UserSettings/Settings.cs
index 7714768f0..94a1639d6 100644
--- a/Wox.Infrastructure/UserSettings/Settings.cs
+++ b/Wox.Infrastructure/UserSettings/Settings.cs
@@ -25,8 +25,7 @@ namespace Wox.Infrastructure.UserSettings
         /// <summary>
         /// when false Alphabet static service will always return empty results
         /// </summary>
-        public bool ShouldUsePinyin { get; set; } = true;
-
+        public bool ShouldUsePinyin { get; set; } = false;
 
         internal StringMatcher.SearchPrecisionScore QuerySearchPrecision { get; private set; } = StringMatcher.SearchPrecisionScore.Regular;
 
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 1eddd8ab6..7fe6d8750 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -55,7 +55,7 @@
                 <CheckBox Margin="10" IsChecked="{Binding Settings.AutoUpdates}">
                     <TextBlock Text="{DynamicResource autoUpdates}" />
                 </CheckBox>
-                <CheckBox Margin="10" IsChecked="{Binding Settings.ShouldUsePinyin}">
+                <CheckBox Margin="10" IsChecked="{Binding ShouldUsePinyin}">
                     <TextBlock Text="{DynamicResource ShouldUsePinyin}" />
                 </CheckBox>
                 <StackPanel Margin="10" Orientation="Horizontal">
@@ -72,8 +72,8 @@
                 </StackPanel>
                 <StackPanel Margin="10" Orientation="Horizontal">
                     <TextBlock Text="{DynamicResource language}" />
-                    <ComboBox Margin="10 0 0 0" Width="120" SelectionChanged="OnLanguageChanged"
-                              ItemsSource="{Binding Languages}" SelectedValue="{Binding Settings.Language}"
+                    <ComboBox Margin="10 0 0 0" Width="120"
+                              ItemsSource="{Binding Languages}" SelectedValue="{Binding Language}"
                               DisplayMemberPath="Display" SelectedValuePath="LanguageCode" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="10">
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
index 52addf362..df3b363d5 100644
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@@ -40,12 +40,6 @@ namespace Wox
 
         #region General
 
-        void OnLanguageChanged(object sender, SelectionChangedEventArgs e)
-        {
-            var language = (Language)e.AddedItems[0];
-            InternationalizationManager.Instance.ChangeLanguage(language);
-        }
-
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
         {
             SetStartup();
diff --git a/Wox/ViewModel/SettingWindowViewModel.cs b/Wox/ViewModel/SettingWindowViewModel.cs
index 504e7bdfa..f9160df9f 100644
--- a/Wox/ViewModel/SettingWindowViewModel.cs
+++ b/Wox/ViewModel/SettingWindowViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -77,6 +77,33 @@ namespace Wox.ViewModel
             }
         }
 
+        public string Language
+        {
+            get
+            {
+                return Settings.Language;
+            }
+            set
+            {
+                InternationalizationManager.Instance.ChangeLanguage(value);
+
+                if (InternationalizationManager.Instance.PromptShouldUsePinyin(value))
+                    ShouldUsePinyin = true;
+            }
+        }
+
+        public bool ShouldUsePinyin
+        {
+            get 
+            {
+                return Settings.ShouldUsePinyin;            
+            }
+            set 
+            {
+                Settings.ShouldUsePinyin = value;
+            }
+        }
+
         public List<string> QuerySearchPrecisionStrings
         {
             get