Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
===================================================================
diff -u -r9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d -rb556748931f7d625cf3fac11327fcdc6e462668d
--- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision 9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d)
+++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision b556748931f7d625cf3fac11327fcdc6e462668d)
@@ -35,9 +35,14 @@
     width           : 1000
     height          : 600
     padding         : Variables.defaultMargin
-    onVisibleChanged: vTreatmentRanges.doCheckAcidConcentrate(vTreatmentCreate.acidConcentrateSet,
-                                                              vTreatmentCreate.acidConcentrate)
+    onVisibleChanged: visible ? vTreatmentRanges.doPopulateAcidConcentrate( vTreatmentCreate.acidConcentrateSet,
+                                                                            vTreatmentCreate.acidConcentrate) :
+                                notificationText = ""
 
+    Connections { target: vTDOpMode
+        function onPreTreatmentChanged() { if (vTDOpMode.preTreatment) { _root.close() } }
+    }
+
     Item { id : _contentItem
         anchors.fill: parent
 
@@ -142,7 +147,7 @@
                 }
             }
 
-            function onDidCheckAcidConcentrate ( vChecked ) {
+            function onDidPopulateAcidConcentrate ( vChecked ) {
                 if ( vChecked ) {
                     _potassiumValueControl.isActive = true
                     _calciumValueControl.isActive   = true
Index: sources/view/hd/data/VTreatmentRanges.cpp
===================================================================
diff -u -r9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d -rb556748931f7d625cf3fac11327fcdc6e462668d
--- sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision 9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d)
+++ sources/view/hd/data/VTreatmentRanges.cpp	(.../VTreatmentRanges.cpp)	(revision b556748931f7d625cf3fac11327fcdc6e462668d)
@@ -84,24 +84,24 @@
 }
 
 /**
- * \brief   VTreatmentRanges::doCheckAcidConcentrate
+ * \brief   VTreatmentRanges::doPopulateAcidConcentrate
  * \details Check Acid Concentrate selection when popup is disabled and updatte  notifcation
  */
-void View::VTreatmentRanges::doCheckAcidConcentrate (const int &vSet, const int &vIndex)
+void View::VTreatmentRanges::doPopulateAcidConcentrate (const int &vSet, const int &vIndex)
 {
     enum AcidConcentrates {
         ePotassium  ,
         eCalcium    ,
         eMagnesium  ,
     };
 
-    if ( ! vSet )     { didCheckAcidConcentrate(false); return; }
+    if ( ! vSet )     { didPopulateAcidConcentrate(false); return; }
 
     QString mAcidConcentrate    =_acidConcentrateOptions[vIndex];
     QStringList values          = mAcidConcentrate.split(QRegExp("[^0-9.]"), Qt::SkipEmptyParts);
     potassium   (values.value(AcidConcentrates::ePotassium) .toFloat());
     calcium     (values.value(AcidConcentrates::eCalcium)   .toFloat());
-    didCheckAcidConcentrate(true);
+    didPopulateAcidConcentrate(true);
 }
 
 /*!
Index: sources/view/hd/data/VTreatmentRanges.h
===================================================================
diff -u -r9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d -rb556748931f7d625cf3fac11327fcdc6e462668d
--- sources/view/hd/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision 9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d)
+++ sources/view/hd/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision b556748931f7d625cf3fac11327fcdc6e462668d)
@@ -83,13 +83,13 @@
     VIEW_DEC_SLOT(SettingsData                      )
 
 signals:
-    void didTreatmentRangesDone (       bool vPass      );
-    void didCheckAcidConcentrate(const  bool &vChecked  );
+    void didTreatmentRangesDone     (       bool vPass      );
+    void didPopulateAcidConcentrate (const  bool &vChecked  );
 
 public slots:
-    void doSaveAcidConcentrate  (const QString  &vOption    );
-    void doClearAcidConcentrate (const bool      vSet       );
-    void doCheckAcidConcentrate (const int      &vSet       ,
-                                 const int      &vIndex     );
+    void doSaveAcidConcentrate      (const QString  &vOption    );
+    void doClearAcidConcentrate     (const bool      vSet       );
+    void doPopulateAcidConcentrate  (const int      &vSet       ,
+                                     const int      &vIndex     );
 };
 }