diff --git a/ChangeLog b/ChangeLog
index fc3f79cbd4..e59d83b6e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkicontheme.c (ensure_valid_themes): Only broadcast
+	_GTK_LOAD_ICONTHEMES if we detect a real theme change, not
+	upon initial theme load.  (#323876, Peter Lund)
+
 	* gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
 	fall thru to the wrong window types.  (#323843)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fc3f79cbd4..e59d83b6e8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkicontheme.c (ensure_valid_themes): Only broadcast
+	_GTK_LOAD_ICONTHEMES if we detect a real theme change, not
+	upon initial theme load.  (#323876, Peter Lund)
+
 	* gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
 	fall thru to the wrong window types.  (#323843)
 
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 04b317ffd1..7a0628b036 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1130,6 +1130,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
 {
   GtkIconThemePrivate *priv = icon_theme->priv;
   GTimeVal tv;
+  gboolean was_valid = priv->themes_valid;
 
   if (priv->themes_valid)
     {
@@ -1143,7 +1144,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
     {
       load_themes (icon_theme);
       
-      if (!priv->check_reload && priv->screen)
+      if (!priv->check_reload && was_valid && priv->screen)
 	{	  
 	  static GdkAtom atom_iconthemes = GDK_NONE;
 	  GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT);