diff --git a/ChangeLog b/ChangeLog
index 52911ea9ad..605c2bfdf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-08  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/gimppropwidgets.c (gimp_prop_enum_combo_box_notify):
+	block gimp_prop_enum_combo_box_callback() before changing the
+	combo-box.
+
 2004-07-08  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpsessioninfo.c: only write aux-info for properties
diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c
index 7d83bd7c7a..395e22e059 100644
--- a/app/widgets/gimppropwidgets.c
+++ b/app/widgets/gimppropwidgets.c
@@ -391,7 +391,15 @@ gimp_prop_enum_combo_box_notify (GObject    *config,
                 param_spec->name, &value,
                 NULL);
 
-  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo_box), value);
+  g_signal_handlers_block_by_func (combo_box,
+                                   gimp_prop_enum_combo_box_callback,
+                                   config);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo_box), value));
+
+  g_signal_handlers_unblock_by_func (combo_box,
+                                     gimp_prop_enum_combo_box_callback,
+                                     config);
 }
 
 
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index 7d83bd7c7a..395e22e059 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -391,7 +391,15 @@ gimp_prop_enum_combo_box_notify (GObject    *config,
                 param_spec->name, &value,
                 NULL);
 
-  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo_box), value);
+  g_signal_handlers_block_by_func (combo_box,
+                                   gimp_prop_enum_combo_box_callback,
+                                   config);
+
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo_box), value));
+
+  g_signal_handlers_unblock_by_func (combo_box,
+                                     gimp_prop_enum_combo_box_callback,
+                                     config);
 }