diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index ebd580e1d7..d9e9ef5a9a 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -426,8 +426,10 @@ bool Document::setEdit(Gui::ViewProvider* p, int ModNum, const char *subname)
     Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog();
     if (dlg)
         dlg->setDocumentName(this->getDocument()->getName());
-    if (d->_editViewProvider->isDerivedFrom(ViewProviderDocumentObject::getClassTypeId())) 
-        signalInEdit(*(static_cast<ViewProviderDocumentObject*>(d->_editViewProvider)));
+    if (d->_editViewProvider->isDerivedFrom(ViewProviderDocumentObject::getClassTypeId())) {
+        auto vpd = static_cast<ViewProviderDocumentObject*>(d->_editViewProvider);
+        vpd->getDocument()->signalInEdit(*vpd);
+    }
 
     App::AutoTransaction::setEnable(false);
     return true;