diff --git a/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp b/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp
index 0b9fc15c5a..8b21b5d602 100644
--- a/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp
+++ b/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp
@@ -160,6 +160,8 @@ void RivGridBoxGenerator::updateFromCamera(const cvf::Camera* camera)
             m_gridBoxModel->addPart(m_gridBoxLegendParts[2 * i + 1].p());
         }
     }
+
+    m_gridBoxModel->updateBoundingBoxesRecursive();
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/UserInterface/RiuViewer.cpp b/ApplicationCode/UserInterface/RiuViewer.cpp
index 4be74f84ea..05c0adee29 100644
--- a/ApplicationCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationCode/UserInterface/RiuViewer.cpp
@@ -541,9 +541,9 @@ RimView* RiuViewer::ownerReservoirView()
 //--------------------------------------------------------------------------------------------------
 void RiuViewer::optimizeClippingPlanes()
 {
-    caf::Viewer::optimizeClippingPlanes();
-
     m_gridBoxGenerator->updateFromCamera(mainCamera());
+
+    caf::Viewer::optimizeClippingPlanes();
 }
 
 //--------------------------------------------------------------------------------------------------