Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r3f45841f8e2fa936666f8de8e2a02fe19fb39a8d -ra8fc31a5e27e844ee98fa17f5d95b9e5f5dc15ef --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3f45841f8e2fa936666f8de8e2a02fe19fb39a8d) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a8fc31a5e27e844ee98fa17f5d95b9e5f5dc15ef) @@ -55,7 +55,14 @@ onHeaderMenuIndexChanged: { if ( _root.headerMenuIndex === 2) page(_treatmentHeparin) if ( _root.headerMenuIndex === 1) page(_treatmentTrends) - if ( _root.headerMenuIndex === 0) pop(null) // unwind stack + if ( _root.headerMenuIndex === 0) { + if (vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment) { + page(_treatmentHome) + } + else { + pop(null) // unwind stack + } + } } // Components