diff --git a/ChangeLog b/ChangeLog
index f2fc39b50a..7b4359c904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-19  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/gfig/gfig-dialog.c
+	* plug-ins/gfig/gfig-style.c: combined two "Stroke" labels into a
+	single one.
+
 2004-11-19  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/noisify.c: applied a (modified) patch that adds
@@ -17,8 +23,8 @@
 2004-11-19  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/script-fu/scripts/selection-round.scm: moved into the
-	<Image>/Select/Modify now that we can safely use placeholders from
-	Script-Fu.
+	<Image>/Select/Modify menu now that we can safely use placeholders
+	from Script-Fu.
 
 2004-11-19  Michael Natterer  <mitch@gimp.org>
 
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 91e857fdf1..b7f135a6d7 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -360,10 +360,17 @@ gfig_dialog (void)
   create_notebook_pages (tool_options_notebook);
 
   /* Stroke frame on right side */
-  frame = gimp_frame_new (_("Stroke"));
+  frame = gimp_frame_new (NULL);
   gtk_box_pack_start (GTK_BOX (right_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
+  gfig_context->paint_type_toggle =
+    toggle = gtk_check_button_new_with_mnemonic (_("_Stroke"));
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), selvals.painttype);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), toggle);
+  gtk_widget_show (toggle);
+
   hbox = gtk_hbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
@@ -372,16 +379,10 @@ gfig_dialog (void)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  gfig_context->paint_type_toggle =
-    gtk_check_button_new_with_mnemonic (_("Stro_ke"));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gfig_context->paint_type_toggle),
-                                selvals.painttype);
-  g_signal_connect (gfig_context->paint_type_toggle, "toggled",
+  gtk_widget_set_sensitive (vbox, selvals.painttype);
+  g_signal_connect (toggle, "toggled",
                     G_CALLBACK (set_paint_type_callback),
-                    NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), gfig_context->paint_type_toggle,
-                      FALSE, FALSE, 0);
-  gtk_widget_show (gfig_context->paint_type_toggle);
+                    vbox);
 
   /* foreground color button in Stroke frame*/
   gfig_context->fg_color = g_new (GimpRGB, 1);
diff --git a/plug-ins/gfig/gfig-style.c b/plug-ins/gfig/gfig-style.c
index 831c3ac583..4a66457505 100644
--- a/plug-ins/gfig/gfig-style.c
+++ b/plug-ins/gfig/gfig-style.c
@@ -440,6 +440,8 @@ set_paint_type_callback (GtkToggleButton *toggle,
   gfig_context->default_style.paint_type = paint_type;
   gfig_context->current_style->paint_type = paint_type;
   gfig_paint_callback ();
+
+  gtk_widget_set_sensitive (GTK_WIDGET (data), paint_type);
 }
 
 /*