diff --git a/src/apps/haikudepot/ui/MainWindow.cpp b/src/apps/haikudepot/ui/MainWindow.cpp
index 12c5c6b0f3..77ace4bc2d 100644
--- a/src/apps/haikudepot/ui/MainWindow.cpp
+++ b/src/apps/haikudepot/ui/MainWindow.cpp
@@ -293,6 +293,9 @@ MainWindow::~MainWindow()
 			fShuttingDownWindow->Quit();
 	}
 
+	delete_sem(fPackageToPopulateSem);
+	wait_for_thread(fPopulatePackageWorker, NULL);
+
 	// We must clear the model early to release references.
 	fModel.Clear();
 }