diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
index a0474028b4..5e34e4f09d 100644
--- a/src/Mod/Part/Gui/CrossSections.cpp
+++ b/src/Mod/Part/Gui/CrossSections.cpp
@@ -538,11 +538,7 @@ void CrossSections::makePlanes(Plane type, const std::vector<double>& d, double
 TaskCrossSections::TaskCrossSections(const Base::BoundBox3d& bb)
 {
     widget = new CrossSections(bb);
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_CrossSections"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_CrossSections"), widget);
 }
 
 bool TaskCrossSections::accept()
diff --git a/src/Mod/Part/Gui/CrossSections.h b/src/Mod/Part/Gui/CrossSections.h
index 62f4b64ec3..849b872af6 100644
--- a/src/Mod/Part/Gui/CrossSections.h
+++ b/src/Mod/Part/Gui/CrossSections.h
@@ -96,7 +96,6 @@ public:
 
 private:
     CrossSections* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } // namespace PartGui
diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.cpp b/src/Mod/Part/Gui/DlgBooleanOperation.cpp
index e75ad18086..449d47ab4d 100644
--- a/src/Mod/Part/Gui/DlgBooleanOperation.cpp
+++ b/src/Mod/Part/Gui/DlgBooleanOperation.cpp
@@ -471,11 +471,7 @@ void DlgBooleanOperation::accept()
 TaskBooleanOperation::TaskBooleanOperation()
 {
     widget = new DlgBooleanOperation();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Booleans"),
-        widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Booleans"), widget, false);
 }
 
 void TaskBooleanOperation::clicked(int id)
diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h
index f263f5f475..90d20173db 100644
--- a/src/Mod/Part/Gui/DlgBooleanOperation.h
+++ b/src/Mod/Part/Gui/DlgBooleanOperation.h
@@ -86,7 +86,6 @@ public:
 
 private:
     DlgBooleanOperation* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } // namespace PartGui
diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp
index 775f9f6aec..7556ccfeb1 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -754,11 +754,7 @@ void DlgExtrusion::writeParametersToFeature(App::DocumentObject &feature, App::D
 TaskExtrusion::TaskExtrusion()
 {
     widget = new DlgExtrusion();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Extrude"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Extrude"), widget);
 }
 
 bool TaskExtrusion::accept()
diff --git a/src/Mod/Part/Gui/DlgExtrusion.h b/src/Mod/Part/Gui/DlgExtrusion.h
index bc45774642..3f5f0ce981 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.h
+++ b/src/Mod/Part/Gui/DlgExtrusion.h
@@ -117,7 +117,6 @@ public:
 
 private:
     DlgExtrusion* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } // namespace PartGui
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp
index 706a76c208..26ad96c3dc 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.cpp
+++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp
@@ -1069,11 +1069,7 @@ void FilletEdgesDialog::accept()
 TaskFilletEdges::TaskFilletEdges(Part::Fillet* fillet)
 {
     widget = new DlgFilletEdges(DlgFilletEdges::FILLET, fillet);
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Fillet"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Fillet"), widget);
 }
 
 TaskFilletEdges::~TaskFilletEdges()
@@ -1126,11 +1122,7 @@ const char* DlgChamferEdges::getFilletType() const
 TaskChamferEdges::TaskChamferEdges(Part::Chamfer* chamfer)
 {
     widget = new DlgChamferEdges(chamfer);
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Chamfer"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Chamfer"), widget);
 }
 
 TaskChamferEdges::~TaskChamferEdges()
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h
index 765c659aec..57df921c9d 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.h
+++ b/src/Mod/Part/Gui/DlgFilletEdges.h
@@ -168,7 +168,6 @@ public:
 
 private:
     DlgFilletEdges* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 class TaskChamferEdges : public Gui::TaskView::TaskDialog
@@ -192,7 +191,6 @@ public:
 
 private:
     DlgChamferEdges* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } // namespace PartGui
diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp
index 856af380d6..1a33d4351b 100644
--- a/src/Mod/Part/Gui/DlgPrimitives.cpp
+++ b/src/Mod/Part/Gui/DlgPrimitives.cpp
@@ -2185,16 +2185,11 @@ QString Location::toPlacement() const
 
 TaskPrimitives::TaskPrimitives()
 {
-    Gui::TaskView::TaskBox* taskbox;
     widget = new DlgPrimitives();
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget);
 
     location = new Location();
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), location->windowTitle() ,true, nullptr);
-    taskbox->groupLayout()->addWidget(location);
-    Content.push_back(taskbox);
+    addTaskBox(location);
 }
 
 QDialogButtonBox::StandardButtons TaskPrimitives::getStandardButtons() const
@@ -2227,17 +2222,12 @@ bool TaskPrimitives::reject()
 TaskPrimitivesEdit::TaskPrimitivesEdit(Part::Primitive* feature)
 {
     // create and show dialog for the primitives
-    Gui::TaskView::TaskBox* taskbox;
     widget = new DlgPrimitives(nullptr, feature);
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget);
 
     // create and show dialog for the location
     location = new Location(nullptr, feature);
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), location->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(location);
-    Content.push_back(taskbox);
+    addTaskBox(location);
 }
 
 QDialogButtonBox::StandardButtons TaskPrimitivesEdit::getStandardButtons() const
diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp
index 65bb7fef77..bad05e1a1f 100644
--- a/src/Mod/Part/Gui/DlgRevolution.cpp
+++ b/src/Mod/Part/Gui/DlgRevolution.cpp
@@ -570,11 +570,7 @@ void DlgRevolution::autoSolid()
 TaskRevolution::TaskRevolution()
 {
     widget = new DlgRevolution();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Revolve"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Revolve"), widget);
 }
 
 bool TaskRevolution::accept()
diff --git a/src/Mod/Part/Gui/DlgRevolution.h b/src/Mod/Part/Gui/DlgRevolution.h
index eae9e532fc..e028935fe2 100644
--- a/src/Mod/Part/Gui/DlgRevolution.h
+++ b/src/Mod/Part/Gui/DlgRevolution.h
@@ -98,7 +98,6 @@ public:
 
 private:
     DlgRevolution* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } // namespace PartGui
diff --git a/src/Mod/Part/Gui/DlgScale.cpp b/src/Mod/Part/Gui/DlgScale.cpp
index 3666740351..d83b017086 100644
--- a/src/Mod/Part/Gui/DlgScale.cpp
+++ b/src/Mod/Part/Gui/DlgScale.cpp
@@ -330,11 +330,7 @@ void DlgScale::writeParametersToFeature(App::DocumentObject &feature, App::Docum
 TaskScale::TaskScale()
 {
     widget = new DlgScale();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Scale"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Scale"), widget);
 }
 
 bool TaskScale::accept()
diff --git a/src/Mod/Part/Gui/DlgScale.h b/src/Mod/Part/Gui/DlgScale.h
index 3dc1962c36..de8d8c42db 100644
--- a/src/Mod/Part/Gui/DlgScale.h
+++ b/src/Mod/Part/Gui/DlgScale.h
@@ -86,7 +86,6 @@ public:
 
 private:
     DlgScale* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } // namespace PartGui
diff --git a/src/Mod/Part/Gui/Mirroring.cpp b/src/Mod/Part/Gui/Mirroring.cpp
index e8f94eaa96..ced38bd130 100644
--- a/src/Mod/Part/Gui/Mirroring.cpp
+++ b/src/Mod/Part/Gui/Mirroring.cpp
@@ -358,11 +358,7 @@ bool Mirroring::accept()
 TaskMirroring::TaskMirroring()
 {
     widget = new Mirroring();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Mirror.svg"),
-        widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Mirror.svg"), widget, false);
 }
 
 bool TaskMirroring::accept()
diff --git a/src/Mod/Part/Gui/Mirroring.h b/src/Mod/Part/Gui/Mirroring.h
index 1153f27c01..af5cde42f6 100644
--- a/src/Mod/Part/Gui/Mirroring.h
+++ b/src/Mod/Part/Gui/Mirroring.h
@@ -78,7 +78,6 @@ public:
 
 private:
     Mirroring* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } // namespace PartGui
diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp
index 1ee5a12433..a6cf3ef8de 100644
--- a/src/Mod/Part/Gui/TaskFaceColors.cpp
+++ b/src/Mod/Part/Gui/TaskFaceColors.cpp
@@ -451,10 +451,7 @@ void FaceColors::changeEvent(QEvent* e)
 TaskFaceColors::TaskFaceColors(ViewProviderPartExt* vp)
 {
     widget = new FaceColors(vp);
-    taskbox = new Gui::TaskView::TaskBox(
-        QPixmap(), widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget);
 }
 
 TaskFaceColors::~TaskFaceColors() = default;
diff --git a/src/Mod/Part/Gui/TaskFaceColors.h b/src/Mod/Part/Gui/TaskFaceColors.h
index 63e9131ca8..929ab1fce3 100644
--- a/src/Mod/Part/Gui/TaskFaceColors.h
+++ b/src/Mod/Part/Gui/TaskFaceColors.h
@@ -85,7 +85,6 @@ public:
 
 private:
     FaceColors* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } //namespace PartGui
diff --git a/src/Mod/Part/Gui/TaskLoft.cpp b/src/Mod/Part/Gui/TaskLoft.cpp
index 7cc4de30b2..fe8669407d 100644
--- a/src/Mod/Part/Gui/TaskLoft.cpp
+++ b/src/Mod/Part/Gui/TaskLoft.cpp
@@ -248,11 +248,7 @@ void LoftWidget::changeEvent(QEvent *e)
 TaskLoft::TaskLoft()
 {
     widget = new LoftWidget();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Loft"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Loft"), widget);
 }
 
 TaskLoft::~TaskLoft() = default;
diff --git a/src/Mod/Part/Gui/TaskLoft.h b/src/Mod/Part/Gui/TaskLoft.h
index c06357d0a2..ae9623b3b8 100644
--- a/src/Mod/Part/Gui/TaskLoft.h
+++ b/src/Mod/Part/Gui/TaskLoft.h
@@ -73,7 +73,6 @@ public:
 
 private:
     LoftWidget* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } //namespace PartGui
diff --git a/src/Mod/Part/Gui/TaskOffset.cpp b/src/Mod/Part/Gui/TaskOffset.cpp
index 1cadc25ee1..ab555b8186 100644
--- a/src/Mod/Part/Gui/TaskOffset.cpp
+++ b/src/Mod/Part/Gui/TaskOffset.cpp
@@ -238,11 +238,7 @@ void OffsetWidget::changeEvent(QEvent *e)
 TaskOffset::TaskOffset(Part::Offset* offset)
 {
     widget = new OffsetWidget(offset);
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Offset"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Offset"), widget);
 }
 
 TaskOffset::~TaskOffset() = default;
diff --git a/src/Mod/Part/Gui/TaskOffset.h b/src/Mod/Part/Gui/TaskOffset.h
index 7f58f7df25..d354e539fb 100644
--- a/src/Mod/Part/Gui/TaskOffset.h
+++ b/src/Mod/Part/Gui/TaskOffset.h
@@ -80,7 +80,6 @@ public:
 
 private:
     OffsetWidget* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } //namespace PartGui
diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp
index 8ca6050cb2..42846b66a5 100644
--- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp
+++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp
@@ -599,11 +599,7 @@ void ShapeBuilderWidget::changeEvent(QEvent *e)
 TaskShapeBuilder::TaskShapeBuilder()
 {
     widget = new ShapeBuilderWidget();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Shapebuilder"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Shapebuilder"), widget);
 }
 
 TaskShapeBuilder::~TaskShapeBuilder() = default;
diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.h b/src/Mod/Part/Gui/TaskShapeBuilder.h
index 2ba399138a..870ff2bd0b 100644
--- a/src/Mod/Part/Gui/TaskShapeBuilder.h
+++ b/src/Mod/Part/Gui/TaskShapeBuilder.h
@@ -83,7 +83,6 @@ public:
 
 private:
     ShapeBuilderWidget* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } //namespace PartGui
diff --git a/src/Mod/Part/Gui/TaskSweep.cpp b/src/Mod/Part/Gui/TaskSweep.cpp
index fd4be63904..118eefc918 100644
--- a/src/Mod/Part/Gui/TaskSweep.cpp
+++ b/src/Mod/Part/Gui/TaskSweep.cpp
@@ -462,11 +462,7 @@ void SweepWidget::changeEvent(QEvent *e)
 TaskSweep::TaskSweep() : label(nullptr)
 {
     widget = new SweepWidget();
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Sweep"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Sweep"), widget);
 }
 
 TaskSweep::~TaskSweep()
diff --git a/src/Mod/Part/Gui/TaskSweep.h b/src/Mod/Part/Gui/TaskSweep.h
index 0c50375861..f0d0ec23fe 100644
--- a/src/Mod/Part/Gui/TaskSweep.h
+++ b/src/Mod/Part/Gui/TaskSweep.h
@@ -80,7 +80,6 @@ public:
 private:
     SweepWidget* widget;
     Gui::StatusWidget* label;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } //namespace PartGui
diff --git a/src/Mod/Part/Gui/TaskThickness.cpp b/src/Mod/Part/Gui/TaskThickness.cpp
index 45a4841226..ff70c304f5 100644
--- a/src/Mod/Part/Gui/TaskThickness.cpp
+++ b/src/Mod/Part/Gui/TaskThickness.cpp
@@ -296,11 +296,7 @@ TaskThickness::TaskThickness(Part::Thickness* offset)
 {
     widget = new ThicknessWidget(offset);
     widget->setWindowTitle(ThicknessWidget::tr("Thickness"));
-    taskbox = new Gui::TaskView::TaskBox(
-        Gui::BitmapFactory().pixmap("Part_Thickness"),
-        widget->windowTitle(), true, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(Gui::BitmapFactory().pixmap("Part_Thickness"), widget);
 }
 
 Part::Thickness* TaskThickness::getObject() const
diff --git a/src/Mod/Part/Gui/TaskThickness.h b/src/Mod/Part/Gui/TaskThickness.h
index a5a1984ebe..bd3468f946 100644
--- a/src/Mod/Part/Gui/TaskThickness.h
+++ b/src/Mod/Part/Gui/TaskThickness.h
@@ -79,7 +79,6 @@ public:
 
 private:
     ThicknessWidget* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 } //namespace PartGui