diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index e1f3bcf241..1c620bbbb2 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -350,8 +350,8 @@ bool DolphinApp::OnInit()
 		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strWiimotePlugin =
 			std::string(wiimotePluginFilename.mb_str());
 
-	// Enable the PNG image handler
-	wxInitAllImageHandlers(); 
+	// Enable the PNG image handler for screenshots
+	wxImage::AddHandler(new wxPNGHandler);
 
 	SetEnableAlert(SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers);
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index e3e9952823..a657ac38e7 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -174,10 +174,6 @@ void Initialize(void *init)
 	g_Config.GameIniLoad(globals->game_ini);
 
 	g_Config.UpdateProjectionHack();
-#if defined(HAVE_WX) && HAVE_WX
-	// Enable support for PNG screenshots.
-	wxImage::AddHandler( new wxPNGHandler );
-#endif
 	UpdateActiveConfig();
 
 	if (!OpenGL_Create(g_VideoInitialize, 640, 480))