diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index ed6723e57..c9cce7c20 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -569,13 +569,13 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
                 params->wb.green = currWB.getGreen();
             }
 
-            if (autowb && awbListener && params->wb.method ==  "autitcgreen") {
-                awbListener->WBChanged(params->wb.temperature, params->wb.green, studgood);
-            } 
-
-            if (autowb && awbListener && params->wb.method ==  "autold") {
-                awbListener->WBChanged(params->wb.temperature, params->wb.green, -1.f);
-            } 
+            if (autowb && awbListener) {
+                if (params->wb.method ==  "autitcgreen") {
+                    awbListener->WBChanged(params->wb.temperature, params->wb.green, studgood);
+                } else if (params->wb.method ==  "autold") {
+                    awbListener->WBChanged(params->wb.temperature, params->wb.green, -1.f);
+                }
+            }
 
             /*
                     GammaValues g_a;
diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc
index 150fef5c4..fbcf40faf 100644
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -949,7 +949,6 @@ void WhiteBalance::WBChanged(double temperature, double greenVal, float studgood
         [this, temperature, greenVal, studgood]() -> bool
         {
             disableListener();
-            setEnabled(true);
             temp->setValue(temperature);
             green->setValue(greenVal);
             StudLabel->set_text(