diff --git a/app/display/gimptoolwidget.c b/app/display/gimptoolwidget.c
index d5a11b3423..f06b83a614 100644
--- a/app/display/gimptoolwidget.c
+++ b/app/display/gimptoolwidget.c
@@ -556,14 +556,13 @@ gimp_tool_widget_remove_item (GimpToolWidget *widget,
 }
 
 GimpCanvasGroup *
-gimp_tool_widget_add_stroke_group (GimpToolWidget *widget)
+gimp_tool_widget_add_group (GimpToolWidget *widget)
 {
   GimpCanvasItem *item;
 
   g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
 
   item = gimp_canvas_group_new (widget->private->shell);
-  gimp_canvas_group_set_group_stroking (GIMP_CANVAS_GROUP (item), TRUE);
 
   gimp_tool_widget_add_item (widget, item);
   g_object_unref (item);
@@ -571,6 +570,19 @@ gimp_tool_widget_add_stroke_group (GimpToolWidget *widget)
   return GIMP_CANVAS_GROUP (item);
 }
 
+GimpCanvasGroup *
+gimp_tool_widget_add_stroke_group (GimpToolWidget *widget)
+{
+  GimpCanvasItem *item;
+
+  g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
+
+  item = gimp_tool_widget_add_group (widget);
+  gimp_canvas_group_set_group_stroking (GIMP_CANVAS_GROUP (item), TRUE);
+
+  return GIMP_CANVAS_GROUP (item);
+}
+
 GimpCanvasGroup *
 gimp_tool_widget_add_fill_group (GimpToolWidget *widget)
 {
@@ -578,12 +590,9 @@ gimp_tool_widget_add_fill_group (GimpToolWidget *widget)
 
   g_return_val_if_fail (GIMP_IS_TOOL_WIDGET (widget), NULL);
 
-  item = gimp_canvas_group_new (widget->private->shell);
+  item = gimp_tool_widget_add_group (widget);
   gimp_canvas_group_set_group_filling (GIMP_CANVAS_GROUP (item), TRUE);
 
-  gimp_tool_widget_add_item (widget, item);
-  g_object_unref (item);
-
   return GIMP_CANVAS_GROUP (item);
 }
 
diff --git a/app/display/gimptoolwidget.h b/app/display/gimptoolwidget.h
index 97d3a9b92a..a100d792cf 100644
--- a/app/display/gimptoolwidget.h
+++ b/app/display/gimptoolwidget.h
@@ -175,6 +175,7 @@ void               gimp_tool_widget_add_item         (GimpToolWidget  *widget,
 void               gimp_tool_widget_remove_item      (GimpToolWidget  *widget,
                                                       GimpCanvasItem  *item);
 
+GimpCanvasGroup  * gimp_tool_widget_add_group        (GimpToolWidget  *widget);
 GimpCanvasGroup  * gimp_tool_widget_add_stroke_group (GimpToolWidget  *widget);
 GimpCanvasGroup  * gimp_tool_widget_add_fill_group   (GimpToolWidget  *widget);