diff --git a/freeglut/freeglut/src/fg_structure.c b/freeglut/freeglut/src/fg_structure.c
index 4274667..0fee95d 100644
--- a/freeglut/freeglut/src/fg_structure.c
+++ b/freeglut/freeglut/src/fg_structure.c
@@ -182,6 +182,11 @@ void fgAddToWindowDestroyList( SFG_Window* window )
         fghClearCallBacks( window );
         SET_WCB( *window, Destroy, destroy, destroyData );
     }
+
+	/*
+	 * Similarly, clear all work set for the window, none of this has to be executed anymore
+	 */
+	window->State.WorkMask = 0;
 }
 
 /*