diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp
index b81e7488b..d9de1ee1c 100644
--- a/aegisub/src/audio_box.cpp
+++ b/aegisub/src/audio_box.cpp
@@ -228,6 +228,10 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE
 //////////////
 // Destructor
 AudioBox::~AudioBox() {
+	audioScroll->PopEventHandler(true);
+	HorizontalZoom->PopEventHandler(true);
+	VerticalZoom->PopEventHandler(true);
+	VolumeBar->PopEventHandler(true);
 }
 
 
diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 265eef327..76df0e120 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -223,6 +223,15 @@ SubsEditBox::SubsEditBox (wxWindow *parent,SubtitlesGrid *gridp) : wxPanel(paren
 }
 
 
+//////////////
+// Destructor
+SubsEditBox::~SubsEditBox() {
+	ActorBox->PopEventHandler(true);
+	Effect->PopEventHandler(true);
+	TextEdit->PopEventHandler(true);
+}
+
+
 /////////////////////////////////
 // Set split or single line mode
 void SubsEditBox::SetSplitLineMode(wxSize newSize) {
diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h
index 0d491d1e6..ccb04cc04 100644
--- a/aegisub/src/subs_edit_box.h
+++ b/aegisub/src/subs_edit_box.h
@@ -149,6 +149,7 @@ public:
 	SubsTextEditCtrl *TextEdit;
 
 	SubsEditBox(wxWindow *parent,SubtitlesGrid *gridp);
+	~SubsEditBox();
 
 	void SetOverride (wxString tag,wxString preValue=_T(""),int pos=-1,bool getFocus=true);
 	void SetStyleFlag (wxString tag,wxString preValue=_T(""),int pos=-1);