diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index b53139b801..3223e1a13a 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -578,7 +578,7 @@ void Document::resetIfEditing()
     }
 }
 
-View3DInventor* Document::openEditingView3D(ViewProviderDocumentObject* vp)
+View3DInventor* Document::openEditingView3D(const ViewProviderDocumentObject* vp)
 {
     auto view3d = dynamic_cast<View3DInventor *>(getActiveView());
     // if the currently active view is not the 3d view search for it and activate it
@@ -592,6 +592,16 @@ View3DInventor* Document::openEditingView3D(ViewProviderDocumentObject* vp)
     return view3d;
 }
 
+View3DInventor* Document::openEditingView3D(const App::DocumentObject* obj)
+{
+    if (auto vp = dynamic_cast<ViewProviderDocumentObject*>(
+            Application::Instance->getViewProvider(obj))) {
+        return openEditingView3D(vp);
+    }
+
+    return nullptr;
+}
+
 bool Document::trySetEdit(Gui::ViewProvider* p, int ModNum, const char *subname)
 {
     auto vp = DocumentP::throwIfCastFails(p);
@@ -2357,7 +2367,7 @@ MDIView* Document::getActiveView() const
     return nullptr;
 }
 
-MDIView *Document::setActiveView(ViewProviderDocumentObject *vp, Base::Type typeId)
+MDIView *Document::setActiveView(const ViewProviderDocumentObject* vp, Base::Type typeId)
 {
     MDIView *view = nullptr;
     if (!vp) {
@@ -2372,19 +2382,22 @@ MDIView *Document::setActiveView(ViewProviderDocumentObject *vp, Base::Type type
             }
             else {
                 auto linked = obj->getLinkedObject(true);
-                if (linked!=obj) {
+                if (linked != obj) {
                     auto vpLinked = dynamic_cast<ViewProviderDocumentObject*>(
                                 Application::Instance->getViewProvider(linked));
-                    if (vpLinked)
+                    if (vpLinked) {
                         view = vpLinked->getMDIView();
+                    }
                 }
 
                 if (!view && typeId.isBad()) {
                     MDIView* active = getActiveView();
-                    if (active && active->containsViewProvider(vp))
+                    if (active && active->containsViewProvider(vp)) {
                         view = active;
-                    else
+                    }
+                    else {
                         typeId = View3DInventor::getClassTypeId();
+                    }
                 }
             }
         }
@@ -2401,11 +2414,13 @@ MDIView *Document::setActiveView(ViewProviderDocumentObject *vp, Base::Type type
         }
     }
 
-    if (!view && !typeId.isBad())
+    if (!view && !typeId.isBad()) {
         view = createView(typeId);
+    }
 
-    if (view)
+    if (view) {
         getMainWindow()->setActiveWindow(view);
+    }
 
     return view;
 }
diff --git a/src/Gui/Document.h b/src/Gui/Document.h
index 42a3aae04c..6b0a1786bc 100644
--- a/src/Gui/Document.h
+++ b/src/Gui/Document.h
@@ -218,8 +218,9 @@ public:
     std::list<MDIView*> getMDIViews() const;
     /// returns a list of all MDI views of a certain type
     std::list<MDIView*> getMDIViewsOfType(const Base::Type& typeId) const;
-    MDIView *setActiveView(ViewProviderDocumentObject *vp=nullptr, Base::Type typeId = Base::Type());
-    View3DInventor* openEditingView3D(ViewProviderDocumentObject* vp);
+    MDIView *setActiveView(const ViewProviderDocumentObject* vp = nullptr, Base::Type typeId = Base::Type());
+    View3DInventor* openEditingView3D(const ViewProviderDocumentObject* vp);
+    View3DInventor* openEditingView3D(const App::DocumentObject* obj);
     //@}
 
     /** @name View provider handling  */