diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index b61e08d6b5..bb6f70d405 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -89,7 +89,7 @@ SConfig::~SConfig()
 
 namespace Config
 {
-  const Info<int> MAIN_CODE_HANDLER{{System::Main, "CodeHandler", "CodeHandlerValue"}, 0};
+  const Info<int> MAIN_CODE_HANDLER{{System::Main, "CodeHandler", "CodeHandlerValue"}, 1};
 }
 
 void SConfig::SaveSettings()
diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
index ebdbf9bbc9..eb1665000d 100644
--- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
@@ -227,8 +227,6 @@ void GeneralPane::CreateCheats()
   m_combobox_codehandler->addItem(tr("Dolphin (Stock)"), QVariant(0));
   m_combobox_codehandler->addItem(tr("MPN (Extended)"), QVariant(1));
 
-  m_combobox_codehandler->setCurrentIndex(1);
-
   code_handler_layout->addRow(code_handler_label, m_combobox_codehandler);
   cheats_group_layout->addLayout(code_handler_layout);