diff --git a/ChangeLog b/ChangeLog
index 6d310dc635..6345c05e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-15  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/unsharp.c (run): only store the settings if run
+	interactively. Fixes bug #356044.
+
 2006-09-14  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
 
 	Trying to implement some usability recommendations from
diff --git a/plug-ins/common/unsharp.c b/plug-ins/common/unsharp.c
index 94960ebab9..b9a343c671 100644
--- a/plug-ins/common/unsharp.c
+++ b/plug-ins/common/unsharp.c
@@ -226,8 +226,9 @@ run (const gchar      *name,
       gimp_displays_flush ();
 
       /* set data for next use of filter */
-      gimp_set_data (PLUG_IN_PROC, &unsharp_params,
-                     sizeof (UnsharpMaskParams));
+      if (run_mode == GIMP_RUN_INTERACTIVE)
+        gimp_set_data (PLUG_IN_PROC,
+                       &unsharp_params, sizeof (UnsharpMaskParams));
 
       gimp_drawable_detach(drawable);
       values[0].data.d_status = status;