diff --git a/ChangeLog b/ChangeLog
index da2e8f2b3b..78b3a975a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan  3 22:18:48 MET 1999 Sven Neumann <sven@gimp.org>
+
+	* app/palette.c: applied a patch from Michael Natterer
+	that fixes a segfault in the palette dialog.
+
 Sat Jan  2 23:22:29 GMT 1999 Andy Thomas <alt@picnic.demon.co.uk>
 
 	* app/palette.c
diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c
index d4ff1e863c..5bf786301a 100644
--- a/app/gui/palette-editor.c
+++ b/app/gui/palette-editor.c
@@ -1773,6 +1773,7 @@ palette_color_area_events (GtkWidget *widget,
 	      palette_draw_entries(palette,row,col);
 	      /*  Update the active color name  */
 	      gtk_entry_set_text (GTK_ENTRY (palette->color_name), palette->color->name);
+	      gtk_widget_set_sensitive (palette->color_name, TRUE);
 	     /*  palette_update_current_entry (palette); */
 	      if(bevent->button == 3)
 		{
@@ -2176,6 +2177,7 @@ palette_list_item_update(GtkWidget *widget,
   /* Stop errors in case no colours are selected */ 
   gtk_signal_handler_block(GTK_OBJECT (palette->color_name),palette->entry_sig_id);
   gtk_entry_set_text (GTK_ENTRY (palette->color_name), _("Undefined")); 
+  gtk_widget_set_sensitive (palette->color_name, FALSE);
   gtk_signal_handler_unblock(GTK_OBJECT (palette->color_name),palette->entry_sig_id);
 }
 
diff --git a/app/palette.c b/app/palette.c
index d4ff1e863c..5bf786301a 100644
--- a/app/palette.c
+++ b/app/palette.c
@@ -1773,6 +1773,7 @@ palette_color_area_events (GtkWidget *widget,
 	      palette_draw_entries(palette,row,col);
 	      /*  Update the active color name  */
 	      gtk_entry_set_text (GTK_ENTRY (palette->color_name), palette->color->name);
+	      gtk_widget_set_sensitive (palette->color_name, TRUE);
 	     /*  palette_update_current_entry (palette); */
 	      if(bevent->button == 3)
 		{
@@ -2176,6 +2177,7 @@ palette_list_item_update(GtkWidget *widget,
   /* Stop errors in case no colours are selected */ 
   gtk_signal_handler_block(GTK_OBJECT (palette->color_name),palette->entry_sig_id);
   gtk_entry_set_text (GTK_ENTRY (palette->color_name), _("Undefined")); 
+  gtk_widget_set_sensitive (palette->color_name, FALSE);
   gtk_signal_handler_unblock(GTK_OBJECT (palette->color_name),palette->entry_sig_id);
 }
 
diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c
index d4ff1e863c..5bf786301a 100644
--- a/app/widgets/gimppaletteeditor.c
+++ b/app/widgets/gimppaletteeditor.c
@@ -1773,6 +1773,7 @@ palette_color_area_events (GtkWidget *widget,
 	      palette_draw_entries(palette,row,col);
 	      /*  Update the active color name  */
 	      gtk_entry_set_text (GTK_ENTRY (palette->color_name), palette->color->name);
+	      gtk_widget_set_sensitive (palette->color_name, TRUE);
 	     /*  palette_update_current_entry (palette); */
 	      if(bevent->button == 3)
 		{
@@ -2176,6 +2177,7 @@ palette_list_item_update(GtkWidget *widget,
   /* Stop errors in case no colours are selected */ 
   gtk_signal_handler_block(GTK_OBJECT (palette->color_name),palette->entry_sig_id);
   gtk_entry_set_text (GTK_ENTRY (palette->color_name), _("Undefined")); 
+  gtk_widget_set_sensitive (palette->color_name, FALSE);
   gtk_signal_handler_unblock(GTK_OBJECT (palette->color_name),palette->entry_sig_id);
 }