diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
index 624b3dbfc..795a57850 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
@@ -19,6 +19,7 @@ BEGIN_EVENT_TABLE(DisassemblyDialog, wxFrame)
    EVT_COMMAND( wxID_ANY, debEVT_GOTOINDISASM, DisassemblyDialog::onDebuggerEvent )
    EVT_COMMAND( wxID_ANY, debEVT_STEPOVER, DisassemblyDialog::onDebuggerEvent )
    EVT_COMMAND( wxID_ANY, debEVT_UPDATE, DisassemblyDialog::onDebuggerEvent )
+   EVT_CLOSE( DisassemblyDialog::onClose )
 END_EVENT_TABLE()
 
 
@@ -300,6 +301,11 @@ void DisassemblyDialog::onDebuggerEvent(wxCommandEvent& evt)
 	}
 }
 
+void DisassemblyDialog::onClose(wxCloseEvent& evt)
+{
+	Hide();
+}
+
 void DisassemblyDialog::update()
 {
 	if (currentCpu != NULL)
diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.h b/pcsx2/gui/Debugger/DisassemblyDialog.h
index 7a04a4ccc..511a54b6c 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.h
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.h
@@ -55,6 +55,7 @@ protected:
 	void onDebuggerEvent(wxCommandEvent& evt);
 	void onPageChanging(wxCommandEvent& evt);
 	void onBreakpointClick(wxCommandEvent& evt);
+	void onClose(wxCloseEvent& evt);
 	void stepOver();
 private:
 	CpuTabPage* eeTab;