diff --git a/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp b/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
index cfab274510..804f6df145 100644
--- a/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
+++ b/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
@@ -64,7 +64,6 @@ void RicShowWellAllocationPlotFeature::onActionTriggered(bool isChecked)
 
                 // Make sure the summary plot window is created and visible
                 RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
-                //RiaApplication::instance()->project()->updateConnectedEditors();
                 plotwindow->selectAsCurrentItem(flowPlotColl->defaultPlot());
             }
         }
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
index 83da707b9a..5c0ce41de0 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
@@ -116,7 +116,13 @@ void RimWellAllocationPlot::setFromSimulationWell(RimEclipseWell* simWell)
     m_wellName = simWell->wellResults()->m_wellName;
     m_timeStep = eclView->currentTimeStep();
 
+    // Use the active flow diag solutions, or the first one as default
     m_flowDiagSolution = eclView->cellResult()->flowDiagSolution();
+    if ( !m_flowDiagSolution )
+    {
+        std::vector<RimFlowDiagSolution*> flowSolutions =  m_case->flowDiagSolutions();
+        if ( flowSolutions.size() ) m_flowDiagSolution = flowSolutions.front();
+    }
 
     loadDataAndUpdate();
 }