diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp
index b9d1bca401..db36092e62 100644
--- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp
+++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp
@@ -16,8 +16,7 @@
 #include "DolphinWX/Debugger/BreakpointWindow.h"
 #include "DolphinWX/WxUtils.h"
 
-BreakPointDlg::BreakPointDlg(CBreakPointWindow* _Parent)
-    : wxDialog(_Parent, wxID_ANY, _("Add Breakpoint")), Parent(_Parent)
+BreakPointDlg::BreakPointDlg(wxWindow* _Parent) : wxDialog(_Parent, wxID_ANY, _("Add Breakpoint"))
 {
   Bind(wxEVT_BUTTON, &BreakPointDlg::OnOK, this, wxID_OK);
 
@@ -42,8 +41,7 @@ void BreakPointDlg::OnOK(wxCommandEvent& event)
   if (AsciiToHex(WxStrToStr(AddressString), Address))
   {
     PowerPC::breakpoints.Add(Address);
-    Parent->NotifyUpdate();
-    Close();
+    EndModal(wxID_OK);
   }
   else
   {
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.h b/Source/Core/DolphinWX/Debugger/BreakpointDlg.h
index 6918f4d614..2b9a1f713e 100644
--- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.h
+++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.h
@@ -6,16 +6,14 @@
 
 #include <wx/dialog.h>
 
-class CBreakPointWindow;
 class wxTextCtrl;
 
 class BreakPointDlg : public wxDialog
 {
 public:
-  BreakPointDlg(CBreakPointWindow* _Parent);
+  BreakPointDlg(wxWindow* _Parent);
 
 private:
-  CBreakPointWindow* Parent;
   wxTextCtrl* m_pEditAddress;
 
   void OnOK(wxCommandEvent& event);
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
index 5a1edf7117..7e83b4502e 100644
--- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
+++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
@@ -146,13 +146,19 @@ void CBreakPointWindow::OnClear(wxCommandEvent& WXUNUSED(event))
 void CBreakPointWindow::OnAddBreakPoint(wxCommandEvent& WXUNUSED(event))
 {
   BreakPointDlg bpDlg(this);
-  bpDlg.ShowModal();
+  if (bpDlg.ShowModal() == wxID_OK)
+  {
+    NotifyUpdate();
+  }
 }
 
 void CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& WXUNUSED(event))
 {
   MemoryCheckDlg memDlg(this);
-  memDlg.ShowModal();
+  if (memDlg.ShowModal() == wxID_OK)
+  {
+    NotifyUpdate();
+  }
 }
 
 void CBreakPointWindow::Event_SaveAll(wxCommandEvent& WXUNUSED(event))
diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp
index 0cd16577c4..9d1ca0ca5c 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp
+++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp
@@ -16,8 +16,8 @@
 #include "DolphinWX/Debugger/MemoryCheckDlg.h"
 #include "DolphinWX/WxUtils.h"
 
-MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow* parent)
-    : wxDialog(parent, wxID_ANY, _("Add a Memory Breakpoint")), m_parent(parent)
+MemoryCheckDlg::MemoryCheckDlg(wxWindow* parent)
+    : wxDialog(parent, wxID_ANY, _("Add a Memory Breakpoint"))
 {
   Bind(wxEVT_BUTTON, &MemoryCheckDlg::OnOK, this, wxID_OK);
   Bind(wxEVT_RADIOBUTTON, &MemoryCheckDlg::OnRadioButtonClick, this);
@@ -165,8 +165,7 @@ void MemoryCheckDlg::OnOK(wxCommandEvent& event)
     MemCheck.Break = Break;
 
     PowerPC::memchecks.Add(MemCheck);
-    m_parent->NotifyUpdate();
-    Close();
+    EndModal(wxID_OK);
   }
 
   event.Skip();
diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h
index ca3357cf7f..f894155891 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h
+++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h
@@ -6,7 +6,6 @@
 
 #include <wx/dialog.h>
 
-class CBreakPointWindow;
 class wxRadioButton;
 class wxStaticText;
 class wxTextCtrl;
@@ -14,10 +13,9 @@ class wxTextCtrl;
 class MemoryCheckDlg : public wxDialog
 {
 public:
-  MemoryCheckDlg(CBreakPointWindow* parent);
+  MemoryCheckDlg(wxWindow* parent);
 
 private:
-  CBreakPointWindow* m_parent;
   wxStaticText* m_textAddress;
   wxStaticText* m_textStartAddress;
   wxStaticText* m_textEndAddress;