diff --git a/neo/ui/Window.cpp b/neo/ui/Window.cpp
index 5658d0c9..2bdf96f1 100644
--- a/neo/ui/Window.cpp
+++ b/neo/ui/Window.cpp
@@ -251,6 +251,11 @@ void idWindow::CleanUp() {
 	// Cleanup the named events
 	namedEvents.DeleteContents(true);
 
+	// Cleanup the operations and update vars
+	// (if it is not fixed, orphane register references are possible)
+	ops.Clear();
+	updateVars.Clear();
+
 	drawWindows.Clear();
 	children.DeleteContents(true);
 	definedVars.DeleteContents(true);