diff --git a/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp b/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp
index 2d48cf0c0f..db6eca90d5 100644
--- a/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp
+++ b/ApplicationCode/Commands/RicLinkVisibleViewsFeature.cpp
@@ -99,7 +99,7 @@ void RicLinkVisibleViewsFeature::onActionTriggered(bool isChecked)
     proj->linkedViews.uiCapability()->updateConnectedEditors();
 
     linkedViews->applyAllOperations();
-    linkedViews->updateConnectedEditors();
+    proj->updateConnectedEditors();
 
     // Set managed view collection to selected and expanded in project tree
     caf::PdmUiTreeView* projTreeView = RiuMainWindow::instance()->projectTreeView();
diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp
index 762fdc9716..4d0153181e 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -930,6 +930,11 @@ void RimProject::appendScriptItems(QMenu* menu, RimScriptCollection* scriptColle
 //--------------------------------------------------------------------------------------------------
 void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
 {
+    if (linkedViews.size() > 0)
+    {
+        uiTreeOrdering.add(&linkedViews);
+    }
+
     RimOilField* oilField = activeOilField();
     if (oilField)
     {
@@ -951,8 +956,6 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
 
     uiTreeOrdering.add(scriptCollection());
     
-    uiTreeOrdering.add(&linkedViews);
-
     uiTreeOrdering.setForgetRemainingFields(true);
 }