diff --git a/ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp b/ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp
index 21f1b5f2e8..cd499203ed 100644
--- a/ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp
@@ -119,7 +119,11 @@ void RicEclipsePropertyFilterFeatureImpl::setDefaults( RimEclipsePropertyFilter*
     propertyFilter->firstAncestorOrThisOfTypeAsserted( reservoirView );
 
     propertyFilter->resultDefinition()->setEclipseCase( reservoirView->eclipseCase() );
-    propertyFilter->resultDefinition()->simpleCopy( reservoirView->cellResult() );
+
+    if ( !RiaDefines::isPerCellFaceResult( reservoirView->cellResult()->resultVariable() ) )
+    {
+        propertyFilter->resultDefinition()->simpleCopy( reservoirView->cellResult() );
+    }
 
     propertyFilter->resultDefinition()->loadResult();
     propertyFilter->setToDefaultValues();
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
index 819c0eafcc..19febfe8ed 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
@@ -1593,23 +1593,6 @@ QList<caf::PdmOptionItemInfo>
             optionList.push_back( caf::PdmOptionItemInfo( s, s ) );
         }
 
-        // Ternary Result
-        if ( ternaryEnabled )
-        {
-            bool hasAtLeastOneTernaryComponent = false;
-            if ( cellCenterResultNames.contains( "SOIL" ) )
-                hasAtLeastOneTernaryComponent = true;
-            else if ( cellCenterResultNames.contains( "SGAS" ) )
-                hasAtLeastOneTernaryComponent = true;
-            else if ( cellCenterResultNames.contains( "SWAT" ) )
-                hasAtLeastOneTernaryComponent = true;
-
-            if ( resultCatType == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent )
-            {
-                optionList.push_front( caf::PdmOptionItemInfo( RiaDefines::ternarySaturationResultName(),
-                                                               RiaDefines::ternarySaturationResultName() ) );
-            }
-        }
         if ( addPerCellFaceOptionItems )
         {
             for ( const QString& s : cellFaceResultNames )
@@ -1623,6 +1606,24 @@ QList<caf::PdmOptionItemInfo>
                     optionList.push_back( caf::PdmOptionItemInfo( s, s ) );
                 }
             }
+
+            // Ternary Result
+            if ( ternaryEnabled )
+            {
+                bool hasAtLeastOneTernaryComponent = false;
+                if ( cellCenterResultNames.contains( "SOIL" ) )
+                    hasAtLeastOneTernaryComponent = true;
+                else if ( cellCenterResultNames.contains( "SGAS" ) )
+                    hasAtLeastOneTernaryComponent = true;
+                else if ( cellCenterResultNames.contains( "SWAT" ) )
+                    hasAtLeastOneTernaryComponent = true;
+
+                if ( resultCatType == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent )
+                {
+                    optionList.push_front( caf::PdmOptionItemInfo( RiaDefines::ternarySaturationResultName(),
+                                                                   RiaDefines::ternarySaturationResultName() ) );
+                }
+            }
         }
 
         optionList.push_front(