diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 9dfa6d43e7..0f84a4413e 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -2062,7 +2062,7 @@ void RiaApplication::regressionTestConfigureProject()
                 riv->viewer()->setFixedSize(1000, 745);
             }
 
-            riv->faultCollection->showFaultsOutsideFilters.setValueFromUi(false);
+            riv->faultCollection->setShowFaultsOutsideFilters(false);
             riv->faultResultSettings->showCustomFaultResult.setValueFromUi(false);
         }
     }
diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
index f1284c9a3f..fcf3c7d7f7 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
@@ -119,7 +119,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
             forceDisplayOfFault = true;
         }
 
-        if (rimFault->showFault() || forceDisplayOfFault)
+        if ( (faultCollection->showFaultCollection() && rimFault->showFault()) || forceDisplayOfFault)
         {
             if (faultCollection->showFaultFaces() || forceDisplayOfFault)
             {
diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
index 87ad6441cc..dbdda464e4 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
@@ -59,7 +59,7 @@ RimFaultCollection::RimFaultCollection()
 
     CAF_PDM_InitField(&showFaultFaces,          "ShowFaultFaces",           true,    "Show defined faces", "", "", "");
     CAF_PDM_InitField(&showOppositeFaultFaces,  "ShowOppositeFaultFaces",   true,    "Show opposite faces", "", "", "");
-    CAF_PDM_InitField(&showFaultsOutsideFilters,"ShowFaultsOutsideFilters", true,    "Show faults outside filters", "", "", "");
+    CAF_PDM_InitField(&m_showFaultsOutsideFilters,"ShowFaultsOutsideFilters", true,    "Show faults outside filters", "", "", "");
 
     CAF_PDM_InitField(&faultResult,        "FaultFaceCulling", caf::AppEnum<RimFaultCollection::FaultFaceCullingMode>(RimFaultCollection::FAULT_BACK_FACE_CULLING), "Dynamic Face Selection", "", "", "");
 
@@ -97,7 +97,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
         &showOppositeFaultFaces == changedField ||
         &showFaultCollection == changedField ||
         &showFaultLabel == changedField ||
-        &showFaultsOutsideFilters == changedField ||
+        &m_showFaultsOutsideFilters == changedField ||
         &faultLabelColor == changedField ||
         &faultResult == changedField
         )
@@ -254,7 +254,7 @@ void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
     labs->add(&faultLabelColor);
 
     caf::PdmUiGroup* adv = uiOrdering.addNewGroup("Fault Options");
-    adv->add(&showFaultsOutsideFilters);
+    adv->add(&m_showFaultsOutsideFilters);
 
     caf::PdmUiGroup* ffviz = uiOrdering.addNewGroup("Fault Face Visibility");
     ffviz->add(&showFaultFaces);
@@ -262,3 +262,21 @@ void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
     ffviz->add(&faultResult);
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RimFaultCollection::showFaultsOutsideFilters() const
+{
+    if (!showFaultCollection) return false;
+
+    return m_showFaultsOutsideFilters;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimFaultCollection::setShowFaultsOutsideFilters(bool enableState)
+{
+    m_showFaultsOutsideFilters = enableState;
+}
+
diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.h b/ApplicationCode/ProjectDataModel/RimFaultCollection.h
index b5fbc7b759..f940209d77 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.h
@@ -57,10 +57,12 @@ public:
     void                                syncronizeFaults();
 
     bool                                isGridVisualizationMode() const;
+    
+    bool                                showFaultsOutsideFilters() const;
+    void                                setShowFaultsOutsideFilters(bool enableState);
 
     caf::PdmField<bool>                 showFaultFaces;
     caf::PdmField<bool>                 showOppositeFaultFaces;
-    caf::PdmField<bool>                 showFaultsOutsideFilters;
     
     caf::PdmField<caf::AppEnum< FaultFaceCullingMode > > faultResult;
 
@@ -80,6 +82,7 @@ private:
     virtual void                        defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
 
 private:
-    RimReservoirView* m_reservoirView;
+    caf::PdmField<bool>     m_showFaultsOutsideFilters;
+    RimReservoirView*       m_reservoirView;
 
 };
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index 345ec4d235..e0eecb863d 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -620,7 +620,7 @@ void RimReservoirView::createDisplayModel()
         m_visibleGridParts = geometryTypesToAdd;
     }
 
-    if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters)
+    if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters())
     {
         updateFaultForcedVisibility();
 
@@ -714,7 +714,7 @@ void RimReservoirView::updateCurrentTimeStep()
         geometriesToRecolor.push_back( RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS);
         m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, gridIndices);
 
-        if (faultCollection()->showFaultsOutsideFilters)
+        if (faultCollection()->showFaultsOutsideFilters())
         {
             std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = visibleFaultGeometryTypes();
 
@@ -748,7 +748,7 @@ void RimReservoirView::updateCurrentTimeStep()
             {
                 m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE, gridIndices); 
 
-                if (!faultCollection()->showFaultsOutsideFilters)
+                if (!faultCollection()->showFaultsOutsideFilters())
                 {
                     m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE); 
                 }
@@ -757,7 +757,7 @@ void RimReservoirView::updateCurrentTimeStep()
             {
                 m_reservoirGridPartManager->appendStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE, gridIndices);
 
-                if (!faultCollection()->showFaultsOutsideFilters)
+                if (!faultCollection()->showFaultsOutsideFilters())
                 {
                     m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), RivReservoirViewPartMgr::INACTIVE);
                 }
@@ -1980,7 +1980,7 @@ std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RimReservoirVie
 {
     std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultParts;
 
-    if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters)
+    if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
     {
         faultParts.push_back(RivReservoirViewPartMgr::PROPERTY_FILTERED);
         faultParts.push_back(RivReservoirViewPartMgr::PROPERTY_FILTERED_WELL_CELLS);