diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index 4d6bc4abb0e8..8774caf1ff47 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -1218,8 +1218,8 @@ void TreeWidget::onActivateDocument(QAction* active)
     // activate the specified document
     QByteArray docname = active->data().toByteArray();
     Gui::Document* doc = Application::Instance->getDocument((const char*)docname);
-    if (doc)
-        doc->setActiveView();
+    if (doc && !doc->setActiveView())
+        doc->setActiveView(0,View3DInventor::getClassTypeId());
 }
 
 Qt::DropActions TreeWidget::supportedDropActions () const
@@ -1304,7 +1304,8 @@ void TreeWidget::mouseDoubleClickEvent (QMouseEvent * event)
             onReloadDoc();
             return;
         }
-        doc->setActiveView();
+        if(!doc->setActiveView())
+            doc->setActiveView(0,View3DInventor::getClassTypeId());
     }
     else if (item->type() == TreeWidget::ObjectType) {
         DocumentObjectItem* objitem = static_cast<DocumentObjectItem*>(item);