diff --git a/src/st/st-theme-context.c b/src/st/st-theme-context.c
index 0e96cdba5..7b676b7f7 100644
--- a/src/st/st-theme-context.c
+++ b/src/st/st-theme-context.c
@@ -129,10 +129,11 @@ on_stage_destroy (ClutterStage *stage)
   g_object_unref (context);
 }
 
-static void
+static gboolean
 emit_changed (StThemeContext *context)
 {
   g_signal_emit (context, signals[CHANGED], 0);
+  return FALSE;
 }
 
 static void
@@ -156,7 +157,7 @@ on_icon_theme_changed (StTextureCache *cache,
    * icon_name => icon lookup, faking a theme context change is a good way
    * to force users such as StIcon to look up icons again. Don't bother recreating
    * the root node, though. */
-  emit_changed (context);
+  g_idle_add ((GSourceFunc) emit_changed, context);
 }
 
 /**