diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index f5bdbbc5d..0ed8b1f97 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -494,9 +494,9 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
             }
 
           //  if (params->wb.method == "Auto" && awbListener && params->wb.enabled) {
-            if (autowb && awbListener) {
+            if (autowb && awbListener && params->wb.method ==  "autitcgreen") {
                 awbListener->WBChanged(params->wb.temperature, params->wb.green, studgood);
-            }
+            } 
 
             /*
                     GammaValues g_a;
diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc
index 5c57ca6a0..9a5f1a398 100644
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -461,6 +461,7 @@ void WhiteBalance::optChanged ()
         methconn.block(prevState);
         return;
     }
+    StudLabel->hide();
 
     if (opt != row[methodColumns.colId]) {
 
@@ -566,6 +567,8 @@ void WhiteBalance::optChanged ()
 
 void WhiteBalance::spotPressed ()
 {
+    StudLabel->hide();
+
     if (wblistener) {
         wblistener->spotWBRequested (getSize());
     }