diff --git a/ChangeLog b/ChangeLog
index e79047abc..9b8403e6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-10  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/eglx/clutter-stage-egl.c:
+	(clutter_stage_egl_realize): Sync up with the GLX backend.
+
 2008-04-09  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/Makefile.am: Update the regular expression to match
diff --git a/clutter/eglx/clutter-stage-egl.c b/clutter/eglx/clutter-stage-egl.c
index a430e0837..157281aa0 100644
--- a/clutter/eglx/clutter-stage-egl.c
+++ b/clutter/eglx/clutter-stage-egl.c
@@ -154,7 +154,6 @@ clutter_stage_egl_realize (ClutterActor *actor)
         {
           g_critical ("Unable to create an EGL surface");
 
-          CLUTTER_ACTOR_UNSET_FLAGS (stage_x11->wrapper, CLUTTER_ACTOR_REALIZED);
           CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
           return;
         }
@@ -172,13 +171,15 @@ clutter_stage_egl_realize (ClutterActor *actor)
             {
               g_critical ("Unable to create a suitable EGL context");
 
-              CLUTTER_ACTOR_UNSET_FLAGS (stage_x11->wrapper, CLUTTER_ACTOR_REALIZED);
               CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
               return;
             }
         }
 
+      /* this will make sure to set the current context */
+      CLUTTER_NOTE (BACKEND, "Marking stage as realized and setting context");
       CLUTTER_ACTOR_SET_FLAGS (stage_x11->wrapper, CLUTTER_ACTOR_REALIZED);
+      CLUTTER_ACTOR_SET_FLAGS (stage_x11, CLUTTER_ACTOR_REALIZED);
       clutter_stage_ensure_current (stage_x11->wrapper);
     }
   else