diff --git a/ChangeLog b/ChangeLog
index 266f292cb8..141738cece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 20 16:56:00 CET 2000  Sven Neumann <sven@gimp.org>
+
+	* plug-ins/gdyntext/gdyntext.c: backported the bugfix from 
+	gdyntext-1.4.4. This fixes bug #2354 (extra undo step introduced).
+
 Thu Jan 20 13:20:55 CET 2000  Sven Neumann <sven@gimp.org>
 
 	* app/color_cmds.c
diff --git a/plug-ins/gdyntext/gdyntext.c b/plug-ins/gdyntext/gdyntext.c
index 0bf2b653e0..c6489110eb 100644
--- a/plug-ins/gdyntext/gdyntext.c
+++ b/plug-ins/gdyntext/gdyntext.c
@@ -229,7 +229,6 @@ static void gdt_run(char *name, int nparams, GParam *param, int *nreturn_vals,
 			break;
 	}
 	gdt_render_text(&gdtvals);
-	gdt_set_values(&gdtvals);
 	if (run_mode == RUN_INTERACTIVE)
 		gimp_set_data("plug_in_gdyntext", &gdtvals, sizeof(GdtVals));
 	values[1].data.d_int32 = gdtvals.layer_id; 
@@ -656,6 +655,8 @@ void gdt_render_text_p(GdtVals *data, gboolean show_progress)
 		gimp_image_remove_channel(data->image_id, selection_channel);
 	}
 
+	gdt_set_values(&gdtvals);
+
 	gimp_undo_push_group_end (data->image_id);
 	gimp_displays_flush();
 	if (show_progress)