Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r9c15c403ee00b776def3aaf8bfb32a3f8c6f2792 -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 9c15c403ee00b776def3aaf8bfb32a3f8c6f2792)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3)
@@ -120,7 +120,7 @@
         vPostTreatmentAdjustmentTreatmentLog.patientID          = vTreatmentCreate.patientID
         vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0
 
-        if ( ! PreTreatmentCreatePatientPrescription.isHDFFeatured ) {
+        if ( ! _preTreatmentCreatePatientPrescription.isHDFFeatured ) {
             vTreatmentCreate.substitutionFluidVolume    = 0
             vTreatmentCreate.hdfTreatmentMode           = 0
         }
@@ -142,6 +142,8 @@
         function onDidValidationPass            ( ) {
             activateAndRefresh() // refresh values on validation
             clearErrors()
+
+            if ( _headerbarPrescription.visible) _headerbarPrescription.close()
         }
     }