Index: sources/gui/qml/components/ModalDialog.qml
===================================================================
diff -u -r0ced87f43c28bcc9f3402e19284030ad1405e9e8 -r0797b3a8c28ad756be125a91c45fb53a2783dc9a
--- sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 0ced87f43c28bcc9f3402e19284030ad1405e9e8)
+++ sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a)
@@ -87,6 +87,11 @@
         }
     }
 
+    // fix closing opened dialogs when opmode is changed
+    Connections { target: vTDOpMode
+        function onOpModeChanged() { if ( _root.visible ) { _root.close() } }
+    }
+
     NumberAnimation { id: _autoHideAnimation
         running: false
         target: _root
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -r0797b3a8c28ad756be125a91c45fb53a2783dc9a
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a)
@@ -267,10 +267,10 @@
             visible         : _root.currentIndex === PreTreatmentCreateContent.PatientPrescription
             editingEnabled  : _root.editingEnabled
         }
+
         PreTreatmentCreatePatientPrescription { id: _preTreatmentCreatePatientPrescription;
             visible         : _root.currentIndex === PreTreatmentCreateContent.TreatmentSettings
             editingEnabled  : _root.editingEnabled
-
         }
     }
 }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
===================================================================
diff -u -r4d88a605fb89311e67652a0fdeee2b44471a6223 -r0797b3a8c28ad756be125a91c45fb53a2783dc9a
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 4d88a605fb89311e67652a0fdeee2b44471a6223)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a)
@@ -40,6 +40,8 @@
         vTreatmentCreate.dialysateTemp = vTreatmentRanges.dialysateTempDef
         _heparinRxControl.value = 0
         _heparinRx.reset()
+        vTreatmentCreate.ufPreWeight                    = vTreatmentRanges.weightDef
+        vTreatmentCreate.ufEstimatedTargetWeight        = vTreatmentRanges.weightDef
     }
 
     function refreshAll () {