diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index 1518176a7b..58dd92a9c8 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -460,7 +460,7 @@ Waypoint::~Waypoint()
 	free(this->name);
 
 	if (CleaningPool()) return;
-
+	DeleteWindowById(WC_WAYPOINT_VIEW, this->index);
 	RemoveOrderFromAllVehicles(OT_GOTO_WAYPOINT, this->index);
 
 	RedrawWaypointSign(this);