diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp
index 89658c81a..dfe39e3eb 100644
--- a/src/Mod/PartDesign/Gui/ViewProvider.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp
@@ -31,6 +31,7 @@
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/Part/App/PropertyTopoShape.h>
 #include <Gui/Command.h>
+#include <Gui/Control.h>
 #include <Gui/Application.h>
 #include <Base/Exception.h>
 
@@ -60,6 +61,27 @@ bool ViewProvider::doubleClicked(void)
     return true;
 }
 
+void ViewProvider::unsetEdit(int ModNum)
+{
+    // 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();
+        if ((PartDesignGui::ActivePartObject != NULL) && (oldTip != NULL)) {
+            Gui::Selection().clearSelection();
+            Gui::Selection().addSelection(oldTip->getDocument()->getName(), oldTip->getNameInDocument());
+            Gui::Command::doCommand(Gui::Command::Gui,"FreeCADGui.runCommand('PartDesign_MoveTip')");
+        }
+        oldTip = NULL;
+    }
+    else {
+        PartGui::ViewProviderPart::unsetEdit(ModNum);
+        oldTip = NULL;
+    }
+}
+
 void ViewProvider::updateData(const App::Property* prop)
 {
     if (prop->getTypeId() == Part::PropertyPartShape::getClassTypeId() && 
diff --git a/src/Mod/PartDesign/Gui/ViewProvider.h b/src/Mod/PartDesign/Gui/ViewProvider.h
index 178f84afd..7dff03edb 100644
--- a/src/Mod/PartDesign/Gui/ViewProvider.h
+++ b/src/Mod/PartDesign/Gui/ViewProvider.h
@@ -43,6 +43,8 @@ public:
     void updateData(const App::Property*);
 
 protected:
+    virtual void unsetEdit(int ModNum);
+
     std::string oldWb;
 };
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp
index 490c01b69..7be0f498f 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp
@@ -102,20 +102,6 @@ bool ViewProviderChamfer::setEdit(int ModNum)
     }
 }
 
-void ViewProviderChamfer::unsetEdit(int ModNum)
-{
-    // 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();
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
-}
-
 bool ViewProviderChamfer::onDelete(const std::vector<std::string> &s)
 {
     return ViewProvider::onDelete(s);
diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h
index 4393f9a7d..507a7bb0e 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h
@@ -46,7 +46,6 @@ public:
 
 protected:
     virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
 
 };
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp
index 7d8b60f07..a4632d4da 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp
@@ -102,20 +102,6 @@ bool ViewProviderDraft::setEdit(int ModNum)
     }
 }
 
-void ViewProviderDraft::unsetEdit(int ModNum)
-{
-    // 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();
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
-}
-
 bool ViewProviderDraft::onDelete(const std::vector<std::string> &s)
 {
     return ViewProvider::onDelete(s);
diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.h b/src/Mod/PartDesign/Gui/ViewProviderDraft.h
index 07829d2ea..0709c8f40 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderDraft.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.h
@@ -46,7 +46,6 @@ public:
 
 protected:
     virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
 
 };
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp
index 0882ce576..db604d595 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp
@@ -102,20 +102,6 @@ bool ViewProviderFillet::setEdit(int ModNum)
     }
 }
 
-void ViewProviderFillet::unsetEdit(int ModNum)
-{
-    // 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();
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
-}
-
 bool ViewProviderFillet::onDelete(const std::vector<std::string> &s)
 {
     return ViewProvider::onDelete(s);
diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.h b/src/Mod/PartDesign/Gui/ViewProviderFillet.h
index 0c9a01ff1..f2f80df7c 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderFillet.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.h
@@ -46,7 +46,6 @@ public:
 
 protected:
     virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
 
 };
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp b/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp
index cbfa9b3d3..09b120110 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.cpp
@@ -119,20 +119,6 @@ bool ViewProviderGroove::setEdit(int ModNum)
     }
 }
 
-void ViewProviderGroove::unsetEdit(int ModNum)
-{
-    // 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();
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
-}
-
 bool ViewProviderGroove::onDelete(const std::vector<std::string> &s)
 {
     // get the Sketch
diff --git a/src/Mod/PartDesign/Gui/ViewProviderGroove.h b/src/Mod/PartDesign/Gui/ViewProviderGroove.h
index 6f02326e3..c569d3dfc 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderGroove.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderGroove.h
@@ -47,8 +47,7 @@ public:
     virtual bool onDelete(const std::vector<std::string> &);
 
 protected:
-    virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
+    virtual bool setEdit(int ModNum);    
 
 };
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp
index 131e8b145..4204ca62d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp
@@ -116,20 +116,6 @@ bool ViewProviderPad::setEdit(int ModNum)
     }
 }
 
-void ViewProviderPad::unsetEdit(int ModNum)
-{
-    // 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();
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
-}
-
 bool ViewProviderPad::onDelete(const std::vector<std::string> &s)
 {
     PartDesign::Pad* pcPad = static_cast<PartDesign::Pad*>(getObject());
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.h b/src/Mod/PartDesign/Gui/ViewProviderPad.h
index 597a140c6..71fb2c334 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPad.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPad.h
@@ -47,7 +47,6 @@ public:
 
 protected:
     virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
 
 };
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp b/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp
index 4df05c235..23d04a981 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderPocket.cpp
@@ -109,20 +109,6 @@ bool ViewProviderPocket::setEdit(int ModNum)
     }
 }
 
-void ViewProviderPocket::unsetEdit(int ModNum)
-{
-    // 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();
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
-}
-
 bool ViewProviderPocket::onDelete(const std::vector<std::string> &s)
 {
     // get the Sketch
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPocket.h b/src/Mod/PartDesign/Gui/ViewProviderPocket.h
index 701cb77ff..56e10d63f 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPocket.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPocket.h
@@ -47,7 +47,6 @@ public:
 
 protected:
     virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
 
 };
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp
index caa00dd8f..05b18d4d9 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp
@@ -119,20 +119,6 @@ bool ViewProviderRevolution::setEdit(int ModNum)
     }
 }
 
-void ViewProviderRevolution::unsetEdit(int ModNum)
-{
-    // 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();
-    }
-    else {
-        PartGui::ViewProviderPart::unsetEdit(ModNum);
-    }
-}
-
 bool ViewProviderRevolution::onDelete(const std::vector<std::string> &s)
 {
     // get the Sketch
diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
index faad403d5..a2dbeaeaf 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.h
@@ -48,7 +48,6 @@ public:
 
 protected:
     virtual bool setEdit(int ModNum);
-    virtual void unsetEdit(int ModNum);
 
 };