diff --git a/ChangeLog b/ChangeLog
index bdd57154b5..1252c7db0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-25  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpcontainerpopup.c
+	(gimp_container_popup_real_confirm): don't use
+	gimp_context_copy_property() but gimp_context_get_by_type()
+	followed by gimp_context_set_by_type() because GimpContext's
+	"copy" functions are special and skip the normal parent_context
+	logic intentionally (fixes bug #109115).
+
 2003-03-25  Sven Neumann  <sven@gimp.org>
 
 	* configure.in
diff --git a/app/widgets/gimpcontainerpopup.c b/app/widgets/gimpcontainerpopup.c
index 84c578ec30..3ee343c447 100644
--- a/app/widgets/gimpcontainerpopup.c
+++ b/app/widgets/gimpcontainerpopup.c
@@ -275,13 +275,16 @@ gimp_container_popup_real_cancel (GimpContainerPopup *popup)
 static void
 gimp_container_popup_real_confirm (GimpContainerPopup *popup)
 {
-  GimpContextPropType  prop_type;
-  GtkWidget           *widget;
+  GtkWidget  *widget;
+  GimpObject *object;
 
   widget = GTK_WIDGET (popup);
 
-  prop_type = gimp_context_type_to_property (popup->container->children_type);
-  gimp_context_copy_property (popup->context, popup->orig_context, prop_type);
+  object = gimp_context_get_by_type (popup->context,
+                                     popup->container->children_type);
+  gimp_context_set_by_type (popup->orig_context,
+                            popup->container->children_type,
+                            object);
 
   if (gtk_grab_get_current () == widget)
     gtk_grab_remove (widget);