diff --git a/ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp b/ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
index a02d9b46a0..52cf929f5d 100644
--- a/ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
+++ b/ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
@@ -96,6 +96,14 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList& fil
         }
     }
 
+    if ( !openedFiles.empty() )
+    {
+        if ( project && project->mainPlotCollection() )
+        {
+            project->mainPlotCollection()->ensureDefaultFlowPlotsAreCreated();
+        }
+    }
+
     // Import summary cases
     if ( !summaryFileInfos.empty() )
     {
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp b/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
index 5011132162..f837b1f4c3 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
@@ -144,6 +144,14 @@ void RimFlowPlotCollection::addFlowCharacteristicsPlotToStoredPlots( RimFlowChar
 //--------------------------------------------------------------------------------------------------
 RimWellAllocationPlot* RimFlowPlotCollection::defaultWellAllocPlot()
 {
+    if ( !m_defaultWellAllocPlot() )
+    {
+        m_defaultWellAllocPlot = new RimWellAllocationPlot;
+        m_defaultWellAllocPlot->setDescription( "Default Flow Diagnostics Plot" );
+    }
+
+    this->updateConnectedEditors();
+
     return m_defaultWellAllocPlot();
 }
 
@@ -152,32 +160,29 @@ RimWellAllocationPlot* RimFlowPlotCollection::defaultWellAllocPlot()
 //--------------------------------------------------------------------------------------------------
 RimFlowCharacteristicsPlot* RimFlowPlotCollection::defaultFlowCharacteristicsPlot()
 {
+    if ( !m_flowCharacteristicsPlot() )
+    {
+        m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
+    }
+
+    this->updateConnectedEditors();
+
     return m_flowCharacteristicsPlot();
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimFlowPlotCollection::ensureDefaultPlotsAreCreated()
+void RimFlowPlotCollection::ensureDefaultFlowPlotsAreCreated()
 {
-    bool isUpdateRequired = false;
-
-    if ( !m_flowCharacteristicsPlot() )
-    {
-        m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
-        isUpdateRequired          = true;
-    }
-
     if ( !m_defaultWellAllocPlot() )
     {
         m_defaultWellAllocPlot = new RimWellAllocationPlot;
         m_defaultWellAllocPlot->setDescription( "Default Flow Diagnostics Plot" );
-
-        isUpdateRequired = true;
     }
 
-    if ( isUpdateRequired )
+    if ( !m_flowCharacteristicsPlot() )
     {
-        this->updateConnectedEditors();
+        m_flowCharacteristicsPlot = new RimFlowCharacteristicsPlot;
     }
 }
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h b/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h
index af384cff8f..07b6ae713f 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h
+++ b/ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h
@@ -45,8 +45,7 @@ public:
     void                        addFlowCharacteristicsPlotToStoredPlots( RimFlowCharacteristicsPlot* plot );
     RimWellAllocationPlot*      defaultWellAllocPlot();
     RimFlowCharacteristicsPlot* defaultFlowCharacteristicsPlot();
-
-    void ensureDefaultPlotsAreCreated();
+    void                        ensureDefaultFlowPlotsAreCreated();
 
 private:
     caf::PdmChildField<RimFlowCharacteristicsPlot*>      m_flowCharacteristicsPlot;
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
index b4712a2e9b..3b4b882b07 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
@@ -154,6 +154,8 @@ RimWellAllocationPlot::~RimWellAllocationPlot()
 //--------------------------------------------------------------------------------------------------
 void RimWellAllocationPlot::setFromSimulationWell( RimSimWellInView* simWell )
 {
+    m_showWindow = true;
+
     RimEclipseView* eclView;
     simWell->firstAncestorOrThisOfType( eclView );
     RimEclipseResultCase* eclCase;
@@ -170,8 +172,6 @@ void RimWellAllocationPlot::setFromSimulationWell( RimSimWellInView* simWell )
         m_flowDiagSolution = m_case->defaultFlowDiagSolution();
     }
 
-    m_showWindow = true;
-
     onLoadDataAndUpdate();
 }
 
diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
index ad4a03392b..1aad146b0a 100644
--- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
@@ -305,5 +305,5 @@ void RimMainPlotCollection::deleteAllCachedData()
 //--------------------------------------------------------------------------------------------------
 void RimMainPlotCollection::ensureDefaultFlowPlotsAreCreated()
 {
-    m_flowPlotCollection()->ensureDefaultPlotsAreCreated();
+    m_flowPlotCollection()->ensureDefaultFlowPlotsAreCreated();
 }
diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h
index ac65e42a57..d98a25b872 100644
--- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h
@@ -66,7 +66,6 @@ public:
     void updatePlotsWithFormations();
     void updatePlotsWithCompletions();
     void deleteAllCachedData();
-
     void ensureDefaultFlowPlotsAreCreated();
 
 private:
diff --git a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
index 9b3c70a95e..b13df48c45 100644
--- a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
+++ b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
@@ -24,7 +24,6 @@
 #include "RiaSummaryTools.h"
 
 #include "RimEnsembleCurveSetCollection.h"
-#include "RimMainPlotCollection.h"
 #include "RimProject.h"
 #include "RimSummaryCaseMainCollection.h"
 #include "RimSummaryCurveCollection.h"
@@ -99,8 +98,7 @@ QString RiuPlotMainWindow::mainWindowName()
 //--------------------------------------------------------------------------------------------------
 void RiuPlotMainWindow::initializeGuiNewProjectLoaded()
 {
-    auto project = RiaApplication::instance()->project();
-    setPdmRoot( project );
+    setPdmRoot( RiaApplication::instance()->project() );
     restoreTreeViewState();
 
     if ( m_pdmUiPropertyView && m_pdmUiPropertyView->currentObject() )
@@ -142,11 +140,6 @@ void RiuPlotMainWindow::initializeGuiNewProjectLoaded()
     }
 
     refreshToolbars();
-
-    if ( project && project->mainPlotCollection() )
-    {
-        project->mainPlotCollection()->ensureDefaultFlowPlotsAreCreated();
-    }
 }
 
 //--------------------------------------------------------------------------------------------------