Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r1ace5e0f5af0ece2e2b69534fea0cc7ec962109e -r46c199321c96fc15781477d0954a1f1805d1d9a8
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 1ace5e0f5af0ece2e2b69534fea0cc7ec962109e)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 46c199321c96fc15781477d0954a1f1805d1d9a8)
@@ -197,25 +197,16 @@
         visible                 : ! vTDOpMode.inTreatment
 
         onActivated: {
-            let actualIndex = currentIndex
+            const selectedItem = model[currentIndex]
+
             // only send  AdjustParametersConfirmRequestData::eCancel when validated
             // Telling FW user is canceling confirm treatment parameters
             if ( vTreatmentCreate.parametersValidated ) { vTreatmentCreate.doCancel() }
-            else { actualIndex++ }
 
-            switch (actualIndex) {
-            case PreTreatmentCreateContent.Edit:
-                // now handled above by 'vTreatmentCreate.doCancel()' monitoring 'vTreatmentCreate.parametersValidated'
-                break
-            case PreTreatmentCreateContent.Select:
-                print("TODO: Open and Select from Prescription Manager" )
-                break
-            case PreTreatmentCreateContent.Clear:
-                vTreatmentCreate.doClear()
-                break
-            default: // Unknown state
-                break
-            }
+            if      ( selectedItem === _root.editRx     )   {                                                           }
+            else if ( selectedItem === _root.selectRx   )   { print("TODO: Open and Select from Prescription Manager" ) }
+            else if ( selectedItem === _root.clearAll   )   { vTreatmentCreate.doClear()                                }
+            else                                            {  /*Unknown state */                                       }
         }
     }