diff --git a/src/kits/interface/PopUpMenu.cpp b/src/kits/interface/PopUpMenu.cpp
index 0d5b161d92..1b763158f3 100644
--- a/src/kits/interface/PopUpMenu.cpp
+++ b/src/kits/interface/PopUpMenu.cpp
@@ -354,8 +354,10 @@ BPopUpMenu::entry(void *arg)
 	delete_sem(data->lock);
 
 	// Commit suicide if needed	
-	if (menu->fAutoDestruct)
-		delete menu;	
+	if (menu->fAutoDestruct) {
+		menu->fTrackThread = -1;
+		delete menu;
+	}
 
 	if (data->async)
 		delete data;