diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index e4187d3201..8fbd77b60b 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -296,10 +296,10 @@ void Workbench::activated()
         "PartDesign_Hole",
         "PartDesign_Revolution",
         "PartDesign_Groove",
-        "PartDesign_AdditivePipe",
-        "PartDesign_SubtractivePipe",
         "PartDesign_AdditiveLoft",
         "PartDesign_SubtractiveLoft",
+        "PartDesign_AdditivePipe",
+        "PartDesign_SubtractivePipe",
         "PartDesign_AdditiveHelix",
         "PartDesign_SubtractiveHelix",
         nullptr};
@@ -310,6 +310,53 @@ void Workbench::activated()
         "PartDesign_Body"
     ));
 
+    const char* Sketches[] = {
+        "PartDesign_AdditiveLoft",
+        "PartDesign_SubtractiveLoft",
+        "PartDesign_AdditivePipe",
+        "PartDesign_SubtractivePipe",
+        nullptr};
+    Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
+        "SELECT Sketcher::SketchObject COUNT 2..",
+        Sketches,
+        "Modeling tools",
+        "PartDesign_Body"
+    ));
+
+    const char* ShapeBinder[] = {
+        "PartDesign_Pad",
+        "PartDesign_Pocket",
+        "PartDesign_Revolution",
+        "PartDesign_Groove",
+        "PartDesign_AdditiveLoft",
+        "PartDesign_SubtractiveLoft",
+        "PartDesign_AdditivePipe",
+        "PartDesign_SubtractivePipe",
+        nullptr};
+    Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
+        "SELECT PartDesign::ShapeBinder COUNT 1",
+        ShapeBinder,
+        "Modeling tools",
+        "PartDesign_Body"
+    ));
+
+    const char* SubShapeBinder[] = {
+        "PartDesign_Pad",
+        "PartDesign_Pocket",
+        "PartDesign_Revolution",
+        "PartDesign_Groove",
+        "PartDesign_AdditiveLoft",
+        "PartDesign_SubtractiveLoft",
+        "PartDesign_AdditivePipe",
+        "PartDesign_SubtractivePipe",
+        nullptr};
+    Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
+        "SELECT PartDesign::SubShapeBinder COUNT 1",
+        SubShapeBinder,
+        "Modeling tools",
+        "PartDesign_Body"
+    ));
+
     const char* Transformed[] = {
         "PartDesign_Mirrored",
         "PartDesign_LinearPattern",