diff --git a/ChangeLog b/ChangeLog
index 565b8532d..b08df7679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-14  Matthew Allum  <mallum@openedhand.com>
+
+	* clutter/eglx/clutter-stage-egl.c:
+        Actually set wm protocols on eglx stage windows. Fixes issues with
+        cloising stages and cleanup.
+
 2008-04-14  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/cogl/gles/cogl.c: (cogl_color):
diff --git a/clutter/eglx/clutter-stage-egl.c b/clutter/eglx/clutter-stage-egl.c
index 684de9ebf..4cca02243 100644
--- a/clutter/eglx/clutter-stage-egl.c
+++ b/clutter/eglx/clutter-stage-egl.c
@@ -65,7 +65,7 @@ clutter_stage_egl_unrealize (ClutterActor *actor)
 
   clutter_stage_ensure_current (stage_x11->wrapper);
 
-  /* XSync (stage_x11->xdpy, False); */
+  XSync (stage_x11->xdpy, False); 
 
   clutter_x11_untrap_x_errors ();
 
@@ -138,6 +138,10 @@ clutter_stage_egl_realize (ClutterActor *actor)
 		    | ButtonReleaseMask
 		    | PropertyChangeMask);
 
+      /* FIXME, do these in a clutterstage_x11_realise? */
+      clutter_stage_x11_fix_window_size (stage_x11);
+      clutter_stage_x11_set_wm_protocols (stage_x11);
+
       if (stage_egl->egl_surface != EGL_NO_SURFACE)
         {
 	  eglDestroySurface (backend_egl->edpy, stage_egl->egl_surface);