diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc
index 1218c0fec..07f86542c 100644
--- a/rtgui/lensgeom.cc
+++ b/rtgui/lensgeom.cc
@@ -134,9 +134,11 @@ int LensGeometry::doDisableAutoFillIfActive (void* data)
         if (instance->fill->get_active()) {
             instance->fillConn.block (true);
             instance->fill->set_active(false);
+
             if (instance->listener) {
                 instance->listener->panelChanged (EvTransAutoFill, M("GENERAL_DISABLED"));
             }
+
             instance->fillConn.block (false);
         }
     }
diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index 5555d6dd7..c24bc5cf0 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -67,7 +67,7 @@ LensProfilePanel::LensProfilePanel () : FoldableToolPanel(this, "lensprof", M("T
 
     conLCPFile = fcbLCPFile->signal_file_set().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileChanged), true);
     btnReset->signal_clicked().connect( sigc::mem_fun(*this, &LensProfilePanel::onLCPFileReset), true);
-    ckbUseDist->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseDistChanged) );
+    conUseDist = ckbUseDist->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseDistChanged) );
     ckbUseVign->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseVignChanged) );
     ckbUseCA->signal_toggled().connect( sigc::mem_fun(*this, &LensProfilePanel::onUseCAChanged) );
 
@@ -77,6 +77,7 @@ LensProfilePanel::LensProfilePanel () : FoldableToolPanel(this, "lensprof", M("T
 void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited)
 {
     disableListener ();
+    conUseDist.block(true);
 
     if (!pp->lensProf.lcpFile.empty() && lcpStore->isValidLCPFileName(pp->lensProf.lcpFile)) {
         fcbLCPFile->set_filename (pp->lensProf.lcpFile);
@@ -102,6 +103,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
     lcpFileChanged = useDistChanged = useVignChanged = useCAChanged = false;
 
     enableListener ();
+    conUseDist.block(false);
 }
 
 void LensProfilePanel::setRawMeta(bool raw, const rtengine::ImageMetaData* pMeta)
diff --git a/rtgui/lensprofile.h b/rtgui/lensprofile.h
index 23d02b9a2..cb3a5cc6c 100644
--- a/rtgui/lensprofile.h
+++ b/rtgui/lensprofile.h
@@ -54,7 +54,10 @@ public:
     void onUseDistChanged();
     void onUseVignChanged();
     void onUseCAChanged();
-    void setLensGeomRef( LensGeometry *foo) { lensgeomLcpFill = foo ;};
+    void setLensGeomRef( LensGeometry *foo)
+    {
+        lensgeomLcpFill = foo ;
+    };
 };
 
 #endif