diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 4c51b0155..3dc06e635 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -2256,7 +2256,10 @@ clutter_actor_paint (ClutterActor *self)
    * actors with 0 opacity to be a NOP... */
   if (G_LIKELY (context->pick_mode == CLUTTER_PICK_NONE) &&
       priv->opacity == 0)
-    return;
+    {
+      priv->queued_redraw = FALSE;
+      return;
+    }
 
   /* if we aren't paintable (not in a toplevel with all
    * parents paintable) then do nothing.
diff --git a/tests/micro-bench/test-text-perf.c b/tests/micro-bench/test-text-perf.c
index 8c7d0c492..cd8d9056e 100644
--- a/tests/micro-bench/test-text-perf.c
+++ b/tests/micro-bench/test-text-perf.c
@@ -10,10 +10,9 @@ static int font_size;
 static int n_chars;
 static int rows, cols;
 
-gboolean idle (gpointer data)
+static void
+on_paint (ClutterActor *actor, gconstpointer *data)
 {
-  ClutterActor *stage = CLUTTER_ACTOR (data);
-
   static GTimer *timer = NULL;
   static int fps = 0;
 
@@ -33,8 +32,13 @@ gboolean idle (gpointer data)
       fps = 0;
     }
 
-  clutter_actor_paint (stage);
   ++fps;
+}
+
+static gboolean
+queue_redraw (gpointer stage)
+{
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
 
   return TRUE;
 }
@@ -91,6 +95,8 @@ main (int argc, char *argv[])
   clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
 
+  g_signal_connect (stage, "paint", G_CALLBACK (on_paint), NULL);
+
   label = create_label ();
   w = clutter_actor_get_width (label);
   h = clutter_actor_get_height (label);
@@ -114,7 +120,7 @@ main (int argc, char *argv[])
 
   clutter_actor_show_all (stage);
 
-  g_idle_add (idle, (gpointer) stage);
+  g_idle_add (queue_redraw, stage);
 
   clutter_main ();