diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index a385cd0169..bd9a2dcafb 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -86,6 +86,7 @@ struct DocumentP
     bool       _isClosing;
     bool       _isModified;
     bool       _isTransacting;
+    bool       _changeViewTouchDocument;
     int                         _editMode;
     ViewProvider*               _editViewProvider;
     ViewProviderDocumentObject* _editViewProviderParent;
@@ -209,12 +210,14 @@ Document::Document(App::Document* pcDocument,Application * app)
     // mustn't increment it (Werner Jan-12-2006)
     _pcDocPy = new Gui::DocumentPy(this);
 
-    if (App::GetApplication().GetParameterGroupByPath
-        ("User parameter:BaseApp/Preferences/Document")->GetBool("UsingUndo",true)){
+    ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document");
+    if (hGrp->GetBool("UsingUndo",true)) {
         d->_pcDocument->setUndoMode(1);
         // set the maximum stack size
-        d->_pcDocument->setMaxUndoStackSize(App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document")->GetInt("MaxUndoSize",20));
+        d->_pcDocument->setMaxUndoStackSize(hGrp->GetInt("MaxUndoSize",20));
     }
+
+    d->_changeViewTouchDocument = hGrp->GetBool("ChangeViewProviderTouchDocument", true);
 }
 
 Document::~Document()
@@ -630,6 +633,7 @@ void Document::slotNewObject(const App::DocumentObject& Obj)
             pcProvider = static_cast<ViewProviderDocumentObject*>(base);
             d->_ViewProviderMap[&Obj] = pcProvider;
             d->_CoinMap[pcProvider->getRoot()] = pcProvider;
+            pcProvider->setStatus(Gui::ViewStatus::TouchDocument, d->_changeViewTouchDocument);
 
             try {
                 // if successfully created set the right name and calculate the view
diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h
index c4319264c6..ba6d682ba9 100644
--- a/src/Gui/ViewProvider.h
+++ b/src/Gui/ViewProvider.h
@@ -79,6 +79,7 @@ enum ViewStatus {
     Detach = 1,
     isRestoring = 2,
     UpdatingView = 3,
+    TouchDocument = 4,
 };
 
 
diff --git a/src/Gui/ViewProviderDocumentObject.cpp b/src/Gui/ViewProviderDocumentObject.cpp
index f1704a47c6..050f445850 100644
--- a/src/Gui/ViewProviderDocumentObject.cpp
+++ b/src/Gui/ViewProviderDocumentObject.cpp
@@ -182,8 +182,8 @@ void ViewProviderDocumentObject::onChanged(const App::Property* prop)
             getObject()->Visibility.setValue(Visibility.getValue());
     }
 
-    if (pcDocument && !pcDocument->isModified()) {
-        if(prop)
+    if (pcDocument && !pcDocument->isModified() && testStatus(Gui::ViewStatus::TouchDocument)) {
+        if (prop)
             FC_LOG(prop->getFullName() << " changed");
         pcDocument->setModified(true);
     }