diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 92791d1be0..6e83e692bd 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -135,14 +135,22 @@ void CConfigMain::UpdateGUI()
 		AlwaysUseHLEBIOS->Disable();
 		UseDynaRec->Disable();
 		UseDualCore->Disable();
+		DSPThread->Disable();
 		LockThreads->Disable();
 		OptimizeQuantizers->Disable();
 		SkipIdle->Disable();
 		EnableCheats->Disable();
+		
 		GCSystemLang->Disable();
+		
 		WiiPage->Disable();
+
 		PathsPage->Disable();
-		PluginPage->Disable();
+
+		GraphicSelection->Disable();
+		DSPSelection->Disable();
+		PADSelection->Disable();
+		WiimoteSelection->Disable();
 	}
 }
 
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 1291dd0ec6..1b07e7f561 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -831,12 +831,12 @@ void CFrame::UpdateGUI()
 	GetMenuBar()->FindItem(wxID_OPEN)->Enable(!initialized);
 	m_pSubMenuDrive->Enable(!initialized);
 	GetMenuBar()->FindItem(wxID_REFRESH)->Enable(!initialized);
+	GetMenuBar()->FindItem(IDM_BROWSE)->Enable(!initialized);
 
 	// Emulation
 	GetMenuBar()->FindItem(IDM_STOP)->Enable(running || paused);
 	m_pSubMenuLoad->Enable(initialized);
 	m_pSubMenuSave->Enable(initialized);
-	GetMenuBar()->FindItem(IDM_CONFIG_MAIN)->Enable(!running && !paused);
 
 	// Misc
 	GetMenuBar()->FindItem(IDM_CHANGEDISC)->Enable(initialized);