diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc
index 6da77f8e3..bf88a85e4 100644
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@@ -657,7 +657,7 @@ void Retinex::writeOptions (std::vector<int> &tpOpen)
 
 void Retinex::updateToolState (std::vector<int> &tpOpen)
 {
-    if (tpOpen.size() == 10) {
+    if (tpOpen.size() >= 10) {
         expsettings->set_expanded (tpOpen.at (9));
     }
 }
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 2f37f8c2e..b06463eff 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -583,6 +583,7 @@ void ToolPanelCoordinator::updateToolState()
 
         wavelet->updateToolState(temp);
         wavelet->setExpanded(true);
+        retinex->updateToolState(temp);
     }
 }