diff --git a/ApplicationCode/UserInterface/RiuViewer.cpp b/ApplicationCode/UserInterface/RiuViewer.cpp
index dd99b30a4d..675e67749f 100644
--- a/ApplicationCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationCode/UserInterface/RiuViewer.cpp
@@ -162,6 +162,8 @@ RiuViewer::~RiuViewer()
     if (m_reservoirView)
     {
         m_reservoirView->showWindow = false;
+        m_reservoirView->uiCapability()->updateUiIconFromToggleField();
+
         m_reservoirView->cameraPosition = m_mainCamera->viewMatrix();
     }
     delete m_InfoLabel;