diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index ff8eedbed7..a8b07ccfc2 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -49,9 +49,6 @@ namespace Wox
         {
             CheckUpdate();
 
-            ThemeManager.Instance.ChangeTheme(_settings.Theme);
-            InternationalizationManager.Instance.ChangeLanguage(_settings.Language);
-
             InitProgressbarAnimation();
             WindowIntelopHelper.DisableControlBox(this);
 
diff --git a/Wox/ViewModel/MainViewModel.cs b/Wox/ViewModel/MainViewModel.cs
index 5e7c7392cb..f7dbca1a8f 100644
--- a/Wox/ViewModel/MainViewModel.cs
+++ b/Wox/ViewModel/MainViewModel.cs
@@ -67,7 +67,9 @@ namespace Wox.ViewModel
             HttpProxy.Instance.Settings = _settings;
             UpdaterManager.Instance.Settings = _settings;
             InternationalizationManager.Instance.Settings = _settings;
+            InternationalizationManager.Instance.ChangeLanguage(_settings.Language);
             ThemeManager.Instance.Settings = _settings;
+            ThemeManager.Instance.ChangeTheme(_settings.Theme);
 
             _queryHistoryStorage = new JsonStrorage<QueryHistory>();
             _userSelectedRecordStorage = new JsonStrorage<UserSelectedRecord>();