diff --git a/src/apps/haikudepot/ui/MainWindow.cpp b/src/apps/haikudepot/ui/MainWindow.cpp
index 20bbad945b..68a0c4547a 100644
--- a/src/apps/haikudepot/ui/MainWindow.cpp
+++ b/src/apps/haikudepot/ui/MainWindow.cpp
@@ -292,6 +292,13 @@ MainWindow::~MainWindow()
 		if (fShuttingDownWindow->Lock())
 			fShuttingDownWindow->Quit();
 	}
+
+	// We must clear and delete these early to release references.
+	fModel.Clear();
+	fFeaturedPackagesView->RemoveSelf();
+	fPackageListView->RemoveSelf();
+	delete fFeaturedPackagesView;
+	delete fPackageListView;
 }