diff --git a/ChangeLog b/ChangeLog
index 4cc5f73343..95ac93a237 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-02  Michael Natterer  <mitch@gimp.org>
+
+	* app/gui/tool-options-commands.c
+	(tool_options_save_to_cmd_callback): remember the name of the
+	saved options and set it again after gimp_config_copy_properties().
+	Fixes bug #123660.
+
 2003-10-02  Sven Neumann  <sven@gimp.org>
 
 	* app/gui/image-menu.c: added back ellipsis to Display Filters and
diff --git a/app/actions/tool-options-commands.c b/app/actions/tool-options-commands.c
index 2e0d48330b..21fe2a3392 100644
--- a/app/actions/tool-options-commands.c
+++ b/app/actions/tool-options-commands.c
@@ -62,9 +62,15 @@ tool_options_save_to_cmd_callback (GtkWidget *widget,
                                    guint      action)
 {
   GimpToolOptions *options = GIMP_TOOL_OPTIONS (data);
+  gchar           *name;
+
+  name = g_strdup (gimp_object_get_name (GIMP_OBJECT (options)));
 
   gimp_config_copy_properties (G_OBJECT (options->tool_info->tool_options),
                                G_OBJECT (options));
+  gimp_object_set_name (GIMP_OBJECT (options), name);
+
+  g_free (name);
 }
 
 void
diff --git a/app/gui/tool-options-commands.c b/app/gui/tool-options-commands.c
index 2e0d48330b..21fe2a3392 100644
--- a/app/gui/tool-options-commands.c
+++ b/app/gui/tool-options-commands.c
@@ -62,9 +62,15 @@ tool_options_save_to_cmd_callback (GtkWidget *widget,
                                    guint      action)
 {
   GimpToolOptions *options = GIMP_TOOL_OPTIONS (data);
+  gchar           *name;
+
+  name = g_strdup (gimp_object_get_name (GIMP_OBJECT (options)));
 
   gimp_config_copy_properties (G_OBJECT (options->tool_info->tool_options),
                                G_OBJECT (options));
+  gimp_object_set_name (GIMP_OBJECT (options), name);
+
+  g_free (name);
 }
 
 void