diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index ca4033fdd..cab5693a2 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -249,6 +249,8 @@ static bool delete_children(wxWindow *window, wxWindow *keep) {
 }
 
 FrameMain::~FrameMain () {
+	wxGetApp().frame = 0;
+
 	context->videoController->SetVideo("");
 	context->audioController->CloseAudio();
 
diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp
index 1718289ef..858ae824b 100644
--- a/aegisub/src/main.cpp
+++ b/aegisub/src/main.cpp
@@ -292,6 +292,9 @@ bool AegisubApp::OnInit() {
 /// @return
 ///
 int AegisubApp::OnExit() {
+	if (frame)
+		delete frame;
+
 	if (wxTheClipboard->Open()) {
 		wxTheClipboard->Flush();
 		wxTheClipboard->Close();