diff --git a/nsis/pcsx2_full_install.nsi b/nsis/pcsx2_full_install.nsi
index 55643f37ea..8c9d498256 100644
--- a/nsis/pcsx2_full_install.nsi
+++ b/nsis/pcsx2_full_install.nsi
@@ -61,10 +61,8 @@ Section "!${APP_NAME} (required)" SEC_CORE
     File /nonfatal /oname=gsdx32-ssse3-r${SVNREV_GSDX}.dll   ..\bin\Plugins\gsdx32-ssse3.dll 
     File /nonfatal /oname=gsdx32-sse4-r${SVNREV_GSDX}.dll    ..\bin\Plugins\gsdx32-sse4.dll
     File /nonfatal /oname=gsdx32-avx-r${SVNREV_GSDX}.dll     ..\bin\Plugins\gsdx32-avx.dll
-    File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll       ..\bin\Plugins\zerogs.dll
   
     File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll      ..\bin\Plugins\spu2-x.dll
-    File /nonfatal /oname=zerospu2-r${SVNREV_ZEROSPU2}.dll ..\bin\Plugins\zerospu2.dll
   
     File /nonfatal /oname=cdvdiso-r${SVNREV_CDVDISO}.dll   ..\bin\Plugins\cdvdiso.dll
     File                                                   ..\bin\Plugins\cdvdGigaherz.dll
diff --git a/nsis/pcsx2_web_install.nsi b/nsis/pcsx2_web_install.nsi
index f3a9fb6df2..6ad9b50103 100644
--- a/nsis/pcsx2_web_install.nsi
+++ b/nsis/pcsx2_web_install.nsi
@@ -57,10 +57,8 @@ Section "!${APP_NAME} (required)" SEC_CORE
     File /nonfatal /oname=gsdx32-ssse3-r${SVNREV_GSDX}.dll   ..\bin\Plugins\gsdx32-ssse3.dll 
     File /nonfatal /oname=gsdx32-sse4-r${SVNREV_GSDX}.dll    ..\bin\Plugins\gsdx32-sse4.dll
     File /nonfatal /oname=gsdx32-avx-r${SVNREV_GSDX}.dll     ..\bin\Plugins\gsdx32-avx.dll
-    File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll       ..\bin\Plugins\zerogs.dll
   
     File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll      ..\bin\Plugins\spu2-x.dll
-    File /nonfatal /oname=zerospu2-r${SVNREV_ZEROSPU2}.dll ..\bin\Plugins\zerospu2.dll
   
     File /nonfatal /oname=cdvdiso-r${SVNREV_CDVDISO}.dll   ..\bin\Plugins\cdvdiso.dll
     File                                                   ..\bin\Plugins\cdvdGigaherz.dll
diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp
index 29886355df..3fe434d438 100644
--- a/pcsx2/gui/AppMain.cpp
+++ b/pcsx2/gui/AppMain.cpp
@@ -912,7 +912,6 @@ void Pcsx2App::OnGsFrameClosed( wxWindowID id )
 	if( (m_id_GsFrame == wxID_ANY) || (m_id_GsFrame != id) ) return;
 
 	CoreThread.Suspend();
-	m_id_GsFrame = wxID_ANY;
 
 	if( !m_UseGUI )
 	{
diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp
index 70ab14abe4..6d74ef8ce1 100644
--- a/pcsx2/gui/FrameForGS.cpp
+++ b/pcsx2/gui/FrameForGS.cpp
@@ -410,7 +410,7 @@ GSFrame::~GSFrame() throw()
 void GSFrame::OnCloseWindow(wxCloseEvent& evt)
 {
 	sApp.OnGsFrameClosed( GetId() );
-	evt.Skip();		// and close it.
+	Hide();		// and don't close it.
 }
 
 bool GSFrame::ShowFullScreen(bool show, long style)