diff --git a/ChangeLog b/ChangeLog
index a896f5e5f2..8c8c7eafb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-15  Sven Neumann  <sven@gimp.org>
+
+	* app/gui/file-new-dialog.c (file_new_dialog_set): sync from the
+	given template to the dialog template, not the other way around.
+
+	* app/widgets/gimptemplateeditor.c (gimp_template_editor_constructor):
+	shouldn't have to call the notify callback from here.
+
 2003-10-15  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimpcolorframe.[ch] (gimp_color_frame_set_color):
diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c
index d80e575f16..154121b32c 100644
--- a/app/dialogs/image-new-dialog.c
+++ b/app/dialogs/image-new-dialog.c
@@ -188,8 +188,8 @@ file_new_dialog_set (GtkWidget    *widget,
     {
       template = gimp_image_new_get_last_template (dialog->gimp, gimage);
 
-      gimp_config_sync (GIMP_CONFIG (dialog->template),
-                        GIMP_CONFIG (template), 0);
+      gimp_config_sync (GIMP_CONFIG (template),
+                        GIMP_CONFIG (dialog->template), 0);
 
       g_object_unref (template);
     }
diff --git a/app/gui/file-new-dialog.c b/app/gui/file-new-dialog.c
index d80e575f16..154121b32c 100644
--- a/app/gui/file-new-dialog.c
+++ b/app/gui/file-new-dialog.c
@@ -188,8 +188,8 @@ file_new_dialog_set (GtkWidget    *widget,
     {
       template = gimp_image_new_get_last_template (dialog->gimp, gimage);
 
-      gimp_config_sync (GIMP_CONFIG (dialog->template),
-                        GIMP_CONFIG (template), 0);
+      gimp_config_sync (GIMP_CONFIG (template),
+                        GIMP_CONFIG (dialog->template), 0);
 
       g_object_unref (template);
     }
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
index 4ccd368496..287d455512 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -498,7 +498,6 @@ gimp_template_editor_constructor (GType                  type,
   g_signal_connect (editor->template, "notify",
                     G_CALLBACK (gimp_template_editor_template_notify),
                     editor);
-  gimp_template_editor_template_notify (editor->template, NULL, editor);
 
   return object;
 }