diff --git a/clutter/clutter/clutter-stage-accessible.c b/clutter/clutter/clutter-stage-accessible.c
index daa5dae33..42d759d9e 100644
--- a/clutter/clutter/clutter-stage-accessible.c
+++ b/clutter/clutter/clutter-stage-accessible.c
@@ -55,17 +55,6 @@ clutter_stage_accessible_init (ClutterStageAccessible *stage_accessible)
 {
 }
 
-static void
-clutter_stage_accessible_real_initialize (AtkObject *obj,
-                                          gpointer   data)
-{
-  g_return_if_fail (CLUTTER_IS_STAGE_ACCESSIBLE (obj));
-
-  ATK_OBJECT_CLASS (clutter_stage_accessible_parent_class)->initialize (obj, data);
-
-  atk_object_set_role (obj, ATK_ROLE_WINDOW);
-}
-
 static AtkStateSet*
 clutter_stage_accessible_ref_state_set (AtkObject *obj)
 {
@@ -101,6 +90,5 @@ clutter_stage_accessible_class_init (ClutterStageAccessibleClass *klass)
   AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
 
   /* AtkObject */
-  class->initialize = clutter_stage_accessible_real_initialize;
   class->ref_state_set = clutter_stage_accessible_ref_state_set;
 }
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 5ca451531..534fdb72b 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1153,6 +1153,7 @@ clutter_stage_constructed (GObject *gobject)
 
   /* this will take care to sinking the floating reference */
   _clutter_stage_manager_add_stage (stage_manager, self);
+  clutter_actor_set_accessible_role (CLUTTER_ACTOR (self), ATK_ROLE_WINDOW);
 
   G_OBJECT_CLASS (clutter_stage_parent_class)->constructed (gobject);
 }