diff --git a/src/Mod/Mesh/Gui/DlgDecimating.cpp b/src/Mod/Mesh/Gui/DlgDecimating.cpp
index 8d29e6d777..3d484e6da4 100644
--- a/src/Mod/Mesh/Gui/DlgDecimating.cpp
+++ b/src/Mod/Mesh/Gui/DlgDecimating.cpp
@@ -134,10 +134,7 @@ double DlgDecimating::reduction() const
 TaskDecimating::TaskDecimating()
 {
     widget = new DlgDecimating();  // NOLINT
-    Gui::TaskView::TaskBox* taskbox =
-        new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget, false, nullptr);
 
     std::vector<Mesh::Feature*> meshes = Gui::Selection().getObjectsOfType<Mesh::Feature>();
     if (meshes.size() == 1) {
diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.cpp b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
index 2334948fbc..7f6ea93a8b 100644
--- a/src/Mod/Mesh/Gui/DlgSmoothing.cpp
+++ b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
@@ -152,21 +152,16 @@ SmoothingDialog::~SmoothingDialog() = default;
 TaskSmoothing::TaskSmoothing()
 {
     widget = new DlgSmoothing();  // NOLINT
-    Gui::TaskView::TaskBox* taskbox =
-        new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget, false, nullptr);
 
     selection = new Selection();  // NOLINT
     selection->setObjects(
         Gui::Selection().getSelectionEx(nullptr, Mesh::Feature::getClassTypeId()));
     Gui::Selection().clearSelection();
-    Gui::TaskView::TaskBox* tasksel = new Gui::TaskView::TaskBox();
-    tasksel->groupLayout()->addWidget(selection);
-    tasksel->hide();
-    Content.push_back(tasksel);
+    QWidget* box = addTaskBoxWithoutHeader(selection);
+    box->hide();
 
-    connect(widget, &DlgSmoothing::toggledSelection, tasksel, &QWidget::setVisible);
+    connect(widget, &DlgSmoothing::toggledSelection, box, &QWidget::setVisible);
 }
 
 bool TaskSmoothing::accept()
diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.cpp b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
index 21144686e2..dbe2f65451 100644
--- a/src/Mod/Mesh/Gui/RemeshGmsh.cpp
+++ b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
@@ -406,9 +406,7 @@ bool RemeshGmsh::loadOutput()
 TaskRemeshGmsh::TaskRemeshGmsh(Mesh::Feature* mesh)
 {
     widget = new RemeshGmsh(mesh);
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget, false);
 }
 
 void TaskRemeshGmsh::clicked(int id)
diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.h b/src/Mod/Mesh/Gui/RemeshGmsh.h
index d699b2df5e..f426b80489 100644
--- a/src/Mod/Mesh/Gui/RemeshGmsh.h
+++ b/src/Mod/Mesh/Gui/RemeshGmsh.h
@@ -135,7 +135,6 @@ public:
 
 private:
     RemeshGmsh* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 }  // namespace MeshGui
diff --git a/src/Mod/Mesh/Gui/RemoveComponents.cpp b/src/Mod/Mesh/Gui/RemoveComponents.cpp
index 685715e2f3..6ddc147991 100644
--- a/src/Mod/Mesh/Gui/RemoveComponents.cpp
+++ b/src/Mod/Mesh/Gui/RemoveComponents.cpp
@@ -244,9 +244,7 @@ void RemoveComponentsDialog::clicked(QAbstractButton* btn)
 TaskRemoveComponents::TaskRemoveComponents()
 {
     widget = new RemoveComponents();  // NOLINT
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget, false);
 }
 
 void TaskRemoveComponents::modifyStandardButtons(QDialogButtonBox* box)
diff --git a/src/Mod/Mesh/Gui/RemoveComponents.h b/src/Mod/Mesh/Gui/RemoveComponents.h
index 29f14879b0..1375693a18 100644
--- a/src/Mod/Mesh/Gui/RemoveComponents.h
+++ b/src/Mod/Mesh/Gui/RemoveComponents.h
@@ -125,7 +125,6 @@ public:
 
 private:
     RemoveComponents* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 }  // namespace MeshGui
diff --git a/src/Mod/Mesh/Gui/Segmentation.cpp b/src/Mod/Mesh/Gui/Segmentation.cpp
index 081e09932a..fd6c1d2ca2 100644
--- a/src/Mod/Mesh/Gui/Segmentation.cpp
+++ b/src/Mod/Mesh/Gui/Segmentation.cpp
@@ -159,9 +159,7 @@ void Segmentation::changeEvent(QEvent* e)
 TaskSegmentation::TaskSegmentation(Mesh::Feature* mesh)
 {
     widget = new Segmentation(mesh);  // NOLINT
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget, false);
 }
 
 bool TaskSegmentation::accept()
diff --git a/src/Mod/Mesh/Gui/Segmentation.h b/src/Mod/Mesh/Gui/Segmentation.h
index 77b4aea1b3..df3ad60375 100644
--- a/src/Mod/Mesh/Gui/Segmentation.h
+++ b/src/Mod/Mesh/Gui/Segmentation.h
@@ -79,7 +79,6 @@ public:
 
 private:
     Segmentation* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 }  // namespace MeshGui
diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
index bb1537ba07..91f5e5ba94 100644
--- a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
+++ b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
@@ -544,9 +544,7 @@ void SegmentationBestFit::changeEvent(QEvent* e)
 TaskSegmentationBestFit::TaskSegmentationBestFit(Mesh::Feature* mesh)
 {
     widget = new SegmentationBestFit(mesh);  // NOLINT
-    taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
+    addTaskBox(widget, false);
 }
 
 bool TaskSegmentationBestFit::accept()
diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.h b/src/Mod/Mesh/Gui/SegmentationBestFit.h
index 72b1cddcb6..5e71b426fa 100644
--- a/src/Mod/Mesh/Gui/SegmentationBestFit.h
+++ b/src/Mod/Mesh/Gui/SegmentationBestFit.h
@@ -143,7 +143,6 @@ public:
 
 private:
     SegmentationBestFit* widget;
-    Gui::TaskView::TaskBox* taskbox;
 };
 
 }  // namespace MeshGui
diff --git a/src/Mod/Mesh/Gui/Workbench.cpp b/src/Mod/Mesh/Gui/Workbench.cpp
index b98251efba..ac6a3912fd 100644
--- a/src/Mod/Mesh/Gui/Workbench.cpp
+++ b/src/Mod/Mesh/Gui/Workbench.cpp
@@ -85,6 +85,7 @@ public:
 
         QGroupBox* box = new QGroupBox();
         box->setTitle(tr("Mesh info box"));
+        box->setWindowTitle(tr("Mesh info"));
         // box->setAutoFillBackground(true);
         QGridLayout* grid = new QGridLayout(box);
         grid->addWidget(labelPoints, 0, 0);
@@ -97,10 +98,7 @@ public:
         grid->addWidget(labelMax, 3, 0);
         grid->addWidget(numMax, 3, 1);
 
-        Gui::TaskView::TaskBox* taskbox =
-            new Gui::TaskView::TaskBox(QPixmap(), tr("Mesh info"), false, nullptr);
-        taskbox->groupLayout()->addWidget(box);
-        Content.push_back(taskbox);
+        addTaskBox(box, false);
     }
     bool shouldShow() override
     {