diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp
index 5b0a15e78b..334ef7df97 100644
--- a/Source/Core/DolphinWX/Config/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp
@@ -19,13 +19,6 @@
 #include "DolphinWX/Config/PathConfigPane.h"
 #include "DolphinWX/Config/WiiConfigPane.h"
 
-BEGIN_EVENT_TABLE(CConfigMain, wxDialog)
-
-EVT_CLOSE(CConfigMain::OnClose)
-EVT_BUTTON(wxID_OK, CConfigMain::OnOk)
-
-END_EVENT_TABLE()
-
 CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
 		const wxPoint& position, const wxSize& size, long style)
 	: wxDialog(parent, id, title, position, size, style)
@@ -33,6 +26,9 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
 	// Control refreshing of the ISOs list
 	bRefreshList = false;
 
+	Bind(wxEVT_CLOSE_WINDOW, &CConfigMain::OnClose, this);
+	Bind(wxEVT_BUTTON, &CConfigMain::OnOk, this, wxID_OK);
+
 	CreateGUIControls();
 }
 
diff --git a/Source/Core/DolphinWX/Config/ConfigMain.h b/Source/Core/DolphinWX/Config/ConfigMain.h
index 9a276f3aa7..c7875d76c9 100644
--- a/Source/Core/DolphinWX/Config/ConfigMain.h
+++ b/Source/Core/DolphinWX/Config/ConfigMain.h
@@ -14,7 +14,6 @@ class wxWindow;
 class CConfigMain : public wxDialog
 {
 public:
-
 	CConfigMain(wxWindow* parent,
 		wxWindowID id = wxID_ANY,
 		const wxString& title = _("Dolphin Configuration"),
@@ -45,7 +44,4 @@ private:
 	wxNotebook* Notebook;
 
 	bool bRefreshList;
-
-private:
-	DECLARE_EVENT_TABLE();
 };