diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
index 1e8d50cd2d..679e68f59b 100644
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -160,6 +160,24 @@ LogManager::~LogManager()
   delete m_listeners[LogListener::FILE_LISTENER];
 }
 
+void LogManager::SaveSettings()
+{
+  IniFile ini;
+  ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
+
+  IniFile::Section* options = ini.GetOrCreateSection("Options");
+  options->Set("Verbosity", GetLogLevel());
+  options->Set("WriteToFile", m_listener_ids[LogListener::FILE_LISTENER]);
+  options->Set("WriteToConsole", m_listener_ids[LogListener::CONSOLE_LISTENER]);
+  options->Set("WriteToWindow", m_listener_ids[LogListener::LOG_WINDOW_LISTENER]);
+
+  // Save all enabled/disabled states of the log types to the config ini.
+  for (const auto& container : m_log)
+    ini.GetOrCreateSection("Logs")->Set(container.m_short_name, container.m_enable);
+
+  ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
+}
+
 void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file,
                      int line, const char* format, va_list args)
 {
@@ -244,6 +262,8 @@ void LogManager::Init()
 
 void LogManager::Shutdown()
 {
+  if (s_log_manager)
+    s_log_manager->SaveSettings();
   delete s_log_manager;
   s_log_manager = nullptr;
 }
diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h
index 0645c371f0..153e4d0b0f 100644
--- a/Source/Core/Common/Logging/LogManager.h
+++ b/Source/Core/Common/Logging/LogManager.h
@@ -53,6 +53,8 @@ public:
   void EnableListener(LogListener::LISTENER id, bool enable);
   bool IsListenerEnabled(LogListener::LISTENER id) const;
 
+  void SaveSettings();
+
 private:
   struct LogContainer
   {
diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp
index 6592650040..104d191d61 100644
--- a/Source/Core/DolphinWX/LogConfigWindow.cpp
+++ b/Source/Core/DolphinWX/LogConfigWindow.cpp
@@ -133,23 +133,7 @@ void LogConfigWindow::LoadSettings()
 
 void LogConfigWindow::SaveSettings()
 {
-  IniFile ini;
-  ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
-
-  IniFile::Section* options = ini.GetOrCreateSection("Options");
-  options->Set("Verbosity", m_verbosity->GetSelection() + 1);
-  options->Set("WriteToFile", m_writeFile);
-  options->Set("WriteToConsole", m_writeConsole);
-  options->Set("WriteToWindow", m_writeWindow);
-
-  // Save all enabled/disabled states of the log types to the config ini.
-  for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-  {
-    ini.GetOrCreateSection("Logs")->Set(m_LogManager->GetShortName((LogTypes::LOG_TYPE)i),
-                                        m_checks->IsChecked(i));
-  }
-
-  ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX));
+  m_LogManager->SaveSettings();
 }
 
 // If the verbosity changes while logging