diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index 099722116..9cffdeb7c 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -378,7 +378,7 @@ wxThread::ExitCode FontsCollectorThread::Entry() {
 	collector->Update();
 
 	// Return
-	if (IsDetached()) Delete();
+	if (IsDetached() && TestDestroy()) Delete();
 	return 0;
 }