diff --git a/riscos/window.c b/riscos/window.c
index 9acb05ccd..1b7a3b316 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -395,6 +395,9 @@ void gui_window_destroy(struct gui_window *g)
 
 	if (g->toolbar)
 		ro_gui_theme_destroy_toolbar(g->toolbar);
+	
+	/* remove our wimp event bindings */
+	ro_gui_wimp_event_finalise(g->window);
 
 	/* delete window */
 	error = xwimp_delete_window(g->window);