Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision bea36be2766046e63c4e82539a630b5cee7ce1c6)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -71,6 +71,7 @@
     }
 
     onOpened: {
+        _bphrEntry.setInitialFocus()
         notificationText = notificationTextString
         vTreatmentVitals.doTimerStop()
     }
@@ -81,7 +82,7 @@
 
     onCloseClicked: {
         numPad.hide()
-        numPad.visible = false
+//        numPad.visible = false
         vTreatmentVitals.doSkip()
     }