diff --git a/ChangeLog b/ChangeLog
index 2ad7db22e7..ff06934f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 27 20:57:26 1998 EDT Matthew Wilson <msw@gimp.org>
+
+	* app/curves: Initialize data that is referenced in event handlers
+	in the curves_new_dialog function.  Be on the look out for this
+	kind of stuff in other dialogs.
+	
 Tue Apr 28 00:16:31 1998  Tim Janik  <timj@gtk.org>
 
 	* app/channels_dialog.c (channels_dialog_create): adjust the scrolled
diff --git a/app/base/curves.c b/app/base/curves.c
index 6a244953b4..f3eb7b1023 100644
--- a/app/base/curves.c
+++ b/app/base/curves.c
@@ -437,12 +437,16 @@ curves_new_dialog ()
   GtkWidget *channel_hbox;
   GtkWidget *menu;
   GtkWidget *table;
-  int i;
+  int i, j;
 
   cd = g_malloc (sizeof (CurvesDialog));
   cd->preview = TRUE;
   cd->curve_type = SMOOTH;
   cd->pixmap = NULL;
+  cd->channel = HISTOGRAM_VALUE;
+  for (i = 0; i < 5; i++)
+    for (j = 0; j < 256; j++)
+      cd->curve[i][j] = j;
 
   for (i = 0; i < 5; i++)
     channel_items [i].user_data = (gpointer) cd;
diff --git a/app/curves.c b/app/curves.c
index 6a244953b4..f3eb7b1023 100644
--- a/app/curves.c
+++ b/app/curves.c
@@ -437,12 +437,16 @@ curves_new_dialog ()
   GtkWidget *channel_hbox;
   GtkWidget *menu;
   GtkWidget *table;
-  int i;
+  int i, j;
 
   cd = g_malloc (sizeof (CurvesDialog));
   cd->preview = TRUE;
   cd->curve_type = SMOOTH;
   cd->pixmap = NULL;
+  cd->channel = HISTOGRAM_VALUE;
+  for (i = 0; i < 5; i++)
+    for (j = 0; j < 256; j++)
+      cd->curve[i][j] = j;
 
   for (i = 0; i < 5; i++)
     channel_items [i].user_data = (gpointer) cd;
diff --git a/app/tools/curves.c b/app/tools/curves.c
index 6a244953b4..f3eb7b1023 100644
--- a/app/tools/curves.c
+++ b/app/tools/curves.c
@@ -437,12 +437,16 @@ curves_new_dialog ()
   GtkWidget *channel_hbox;
   GtkWidget *menu;
   GtkWidget *table;
-  int i;
+  int i, j;
 
   cd = g_malloc (sizeof (CurvesDialog));
   cd->preview = TRUE;
   cd->curve_type = SMOOTH;
   cd->pixmap = NULL;
+  cd->channel = HISTOGRAM_VALUE;
+  for (i = 0; i < 5; i++)
+    for (j = 0; j < 256; j++)
+      cd->curve[i][j] = j;
 
   for (i = 0; i < 5; i++)
     channel_items [i].user_data = (gpointer) cd;
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index 6a244953b4..f3eb7b1023 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -437,12 +437,16 @@ curves_new_dialog ()
   GtkWidget *channel_hbox;
   GtkWidget *menu;
   GtkWidget *table;
-  int i;
+  int i, j;
 
   cd = g_malloc (sizeof (CurvesDialog));
   cd->preview = TRUE;
   cd->curve_type = SMOOTH;
   cd->pixmap = NULL;
+  cd->channel = HISTOGRAM_VALUE;
+  for (i = 0; i < 5; i++)
+    for (j = 0; j < 256; j++)
+      cd->curve[i][j] = j;
 
   for (i = 0; i < 5; i++)
     channel_items [i].user_data = (gpointer) cd;