Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r0dfba44fb7172b9458d161b3ed5f54527f93b698 -rbea36be2766046e63c4e82539a630b5cee7ce1c6
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 0dfba44fb7172b9458d161b3ed5f54527f93b698)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision bea36be2766046e63c4e82539a630b5cee7ce1c6)
@@ -67,6 +67,7 @@
         _heparinStopTimeControl         .refresh()
         _dialysateTemperatureControl    .refresh()
         _salineBolusVolumeControl       .refresh()
+        _bpMeasurementIntervalControl   .refresh()
     }
 
     function clear () {
@@ -437,28 +438,23 @@
             unitText    : Variables.unitTextDuration
             valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
 
-            contentItem : BaseComboBox { id: _bpMeasurementIntervalControl
-                anchors.rightMargin : Variables.defaultMargin * 2
-                anchors.leftMargin  : anchors.rightMargin
-                anchors.topMargin   : Variables.defaultMargin / 2
-                anchors.bottomMargin: anchors.topMargin
-                isActive            : vTreatmentCreate.bloodPressureMeasureIntervalSet
-                enabled             : _root.editingEnabled
-                currentIndex        : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
-                model               : vTreatmentRanges.bloodPressureMeasureInterval
-                canOff              : true
-                centerHorizontally  : true
+            contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl
+                editable        : _root.editingEnabled
+                isActive        : vTreatmentCreate.bloodPressureMeasureIntervalSet
+                defaultValue    : vTreatmentRanges.vitalsInterval
+                value           : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
+                model           : vTreatmentRanges.bloodPressureMeasureInterval
+                canOff          : true
 
-                onClear             : {
-                    vTreatmentCreate.bloodPressureMeasureIntervalSet = false
-                }
+                onDidActiveChange: function(vState) {  vTreatmentCreate.bloodPressureMeasureIntervalSet = vState }
 
-                onActivated         : {
+                onDidChange     : function(vValue) {
                     if ( ! _bpMeasurementInterval.valid ) {
                         vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason
                     }
-                    vTreatmentCreate.bloodPressureMeasureInterval    = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex]
-                    vTreatmentCreate.bloodPressureMeasureIntervalSet = true
+
+                    vTreatmentCreate.bloodPressureMeasureInterval       = vTreatmentRanges.bloodPressureMeasureInterval[vValue]
+                    vTreatmentCreate.bloodPressureMeasureIntervalSet    = true
                 }
             }
         }