diff --git a/clutter/clutter-scroll-actor.c b/clutter/clutter-scroll-actor.c
index 888dd59fe..c1a7b2318 100644
--- a/clutter/clutter-scroll-actor.c
+++ b/clutter/clutter-scroll-actor.c
@@ -155,10 +155,20 @@ static void
 clutter_scroll_actor_pick (ClutterActor       *actor,
                            const ClutterColor *pick_color)
 {
+  ClutterActorIter iter;
+  ClutterActor *child;
+
   clutter_scroll_actor_push_clip (actor);
 
   CLUTTER_ACTOR_CLASS (clutter_scroll_actor_parent_class)->pick (actor, pick_color);
 
+  /* FIXME - this has to go away when we remove the vfunc check inside
+   * the ClutterActor::pick default implementation
+   */
+  clutter_actor_iter_init (&iter, actor);
+  while (clutter_actor_iter_next (&iter, &child))
+    clutter_actor_paint (child);
+
   cogl_clip_pop ();
 }