diff --git a/src/Gui/ViewProviderGeometryObject.cpp b/src/Gui/ViewProviderGeometryObject.cpp
index af954acbd..69aed1c7e 100644
--- a/src/Gui/ViewProviderGeometryObject.cpp
+++ b/src/Gui/ViewProviderGeometryObject.cpp
@@ -238,6 +238,7 @@ void ViewProviderGeometryObject::unsetEdit(int ModNum)
     pcRoot->removeChild(csysDragger); //should delete csysDragger
     csysDragger = nullptr;
   }
+  Gui::Control().closeDialog();
 }
 
 void ViewProviderGeometryObject::setEditViewer(Gui::View3DInventorViewer* viewer, int ModNum)