diff --git a/pcsx2/gui/Panels/BiosSelectorPanel.cpp b/pcsx2/gui/Panels/BiosSelectorPanel.cpp
index 1353f1daad..03860fb18a 100644
--- a/pcsx2/gui/Panels/BiosSelectorPanel.cpp
+++ b/pcsx2/gui/Panels/BiosSelectorPanel.cpp
@@ -91,8 +91,6 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow* parent, int idealWidth )
 	sizer.Add( &m_ComboBox, pxSizerFlags::StdExpand() );
 	sizer.AddSpacer( 6 );
 	sizer.Add( &m_FolderPicker, pxSizerFlags::StdExpand() );
-
-	SetSizer( &sizer );
 }
 
 Panels::BiosSelectorPanel::~BiosSelectorPanel() throw ()
diff --git a/pcsx2/gui/Panels/DirPickerPanel.cpp b/pcsx2/gui/Panels/DirPickerPanel.cpp
index 443cbe6e05..5867b2b3e9 100644
--- a/pcsx2/gui/Panels/DirPickerPanel.cpp
+++ b/pcsx2/gui/Panels/DirPickerPanel.cpp
@@ -122,7 +122,6 @@ Panels::DirPickerPanel::DirPickerPanel( wxWindow* parent, FoldersEnum_t folderid
 Panels::DirPickerPanel& Panels::DirPickerPanel::SetStaticDesc( const wxString& msg )
 {
 	InsertStaticTextAt( this, *GetSizer(), 0, msg );
-	//SetSizer( GetSizer(), false );
 	return *this;
 }
 
diff --git a/pcsx2/gui/Panels/PathsPanel.cpp b/pcsx2/gui/Panels/PathsPanel.cpp
index 61c5e961d2..9a1fc0a982 100644
--- a/pcsx2/gui/Panels/PathsPanel.cpp
+++ b/pcsx2/gui/Panels/PathsPanel.cpp
@@ -78,6 +78,5 @@ Panels::StandardPathsPanel::StandardPathsPanel( wxWindow* parent ) :
 		) );
 
 	s_main.AddSpacer( 5 );
-	SetSizer( &s_main );
 }
 
diff --git a/pcsx2/gui/Panels/PluginSelectorPanel.cpp b/pcsx2/gui/Panels/PluginSelectorPanel.cpp
index 9e011ae807..461215970c 100644
--- a/pcsx2/gui/Panels/PluginSelectorPanel.cpp
+++ b/pcsx2/gui/Panels/PluginSelectorPanel.cpp
@@ -212,8 +212,6 @@ Panels::PluginSelectorPanel::ComboBoxPanel::ComboBoxPanel( PluginSelectorPanel*
 	s_main.Add( &s_plugin, wxSizerFlags().Expand() );
 	s_main.AddSpacer( 6 );
 	s_main.Add( &m_FolderPicker, pxSizerFlags::StdExpand() );
-
-	SetSizer( &s_main );
 }
 
 void Panels::PluginSelectorPanel::ComboBoxPanel::Reset()
@@ -440,6 +438,7 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
 	int sel = m_ComponentBoxes->Get(pid).GetSelection();
 	if( sel == wxNOT_FOUND ) return;
 	wxDynamicLibrary dynlib( (*m_FileList)[(int)m_ComponentBoxes->Get(pid).GetClientData(sel)] );
+
 	if( PluginConfigureFnptr configfunc = (PluginConfigureFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"configure" ) )
 	{
 		bool resume = CoreThread.Suspend();
@@ -545,11 +544,11 @@ void Panels::PluginSelectorPanel::OnProgress( wxCommandEvent& evt )
 //  EnumThread   method implementations
 // --------------------------------------------------------------------------------------
 
-Panels::PluginSelectorPanel::EnumThread::EnumThread( PluginSelectorPanel& master ) :
-	PersistentThread()
-,	Results( master.FileCount(), L"PluginSelectorResults" )
-,	m_master( master )
-,	m_hourglass( Cursor_KindaBusy )
+Panels::PluginSelectorPanel::EnumThread::EnumThread( PluginSelectorPanel& master )
+	: PersistentThread()
+	, Results( master.FileCount(), L"PluginSelectorResults" )
+	, m_master( master )
+	, m_hourglass( Cursor_KindaBusy )
 {
 	Results.MatchLengthToAllocatedSize();
 }
diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp
index 4a7f6a71db..975f74cc32 100644
--- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp
+++ b/pcsx2/gui/Panels/SpeedhacksPanel.cpp
@@ -252,7 +252,6 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) :
 	heading->AddTo( mainSizer );
 	mainSizer.Add( s_table, wxSizerFlags().Expand() );
 	mainSizer.Add( &DefEnableSizer, wxSizerFlags().Expand() );
-	SetSizer( &mainSizer );
 
 	// ------------------------------------------------------------------------
 
diff --git a/pcsx2/gui/Panels/VideoPanel.cpp b/pcsx2/gui/Panels/VideoPanel.cpp
index a8602ef087..73f3d75d77 100644
--- a/pcsx2/gui/Panels/VideoPanel.cpp
+++ b/pcsx2/gui/Panels/VideoPanel.cpp
@@ -190,8 +190,7 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
 	s_winsize.Add( &s_customsize, StdSpace().Border( wxLEFT | wxRIGHT | wxBOTTOM) );
 
 
-	wxBoxSizer& s_main( *new wxBoxSizer( wxVERTICAL ) );
-	SetSizer( &s_main );
+	wxSizer& s_main( *GetSizer() );
 
 	s_main.Add( &s_winsize, StdSpace() );