diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -15,6 +15,7 @@
 #include "gfx_func.h"
 #include "command_func.h"
 #include "functions.h"
+#include "window_func.h"
 
 #include "table/strings.h"
 
@@ -45,6 +46,11 @@ public:
 		this->FindWindowPlacementAndResize(desc);
 	}
 
+	~WaypointWindow()
+	{
+		DeleteWindowById(WC_TRAINS_LIST, (this->window_number << 16) | (VEH_TRAIN << 11) | VLW_WAYPOINT_LIST | this->wp->owner);
+	}
+
 	virtual void OnPaint()
 	{
 		/* You can only change your own waypoints */