Switch to PartDesign workbench as soon as a PartDesign feature is edited

src/Mod/PartDesign/Gui/ViewProviderPad.cpp

@@ -100,6 +100,9 @@ bool ViewProviderPad::setEdit(int ModNum)
         // clear the selection (convenience)
         Gui::Selection().clearSelection();
 
+        // always change to PartDesign WB, remember where we come from
+        oldWb = Gui::Command::assureWorkbench("PartDesignWorkbench");
+
         // start the edit dialog
         if (padDlg)
             Gui::Control().showDialog(padDlg);
@@ -115,10 +118,10 @@ bool ViewProviderPad::setEdit(int ModNum)
 
 void ViewProviderPad::unsetEdit(int ModNum)
 {
-    if (ModNum == ViewProvider::Default) {
-        // and update the pad
-        //getSketchObject()->getDocument()->recompute();
+    // return to the WB we were in before editing the PartDesign feature
+    Gui::Command::assureWorkbench(oldWb.c_str());
 
+    if (ModNum == ViewProvider::Default) {
         // when pressing ESC make sure to close the dialog
         Gui::Control().closeDialog();
     }