Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 -r07121b02499a4c929c5b5e8bd804a67539574c1b
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 07121b02499a4c929c5b5e8bd804a67539574c1b)
@@ -52,13 +52,16 @@
             _headerBar.activeStack = stackView
             _root.stackStepIndex = 0
             _headerBar.userMode =  vSettings.advancedMode ?  qsTr("[Advanced]") : ""
+
         }
         else {
             stackView.initialItem = null
             _headerBar.userMode = ""
         }
     }
 
+    stackView.onCurrentItemChanged: if ( stackView.currentItem != _pretreatmentInstallation ) { _headerBar.activeStack = stackView }
+
     // dynamically rebuild map 🗺️ when entering pretreatment.
     // { step key (enum) : step name (string) } -- decided to use 2 parallel list for better indexing
     function rebuildMap() {
@@ -237,12 +240,14 @@
     }
 
     PreTreatmentCreate  { id:   _pretreatmentCreate
-        onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.CreateRx)                       }
+        onVisibleChanged        : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.CreateRx)                   }
+        showCreateRxHeaderButton: false
     }
 
     PreTreatmentBase    { id:   _pretreatmentConnect
-        instructionBased    : true
-        onVisibleChanged    : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Connect);       updateModel()   }
+        instructionBased        : true
+        onVisibleChanged        : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Connect);   updateModel()   }
+        showCreateRxHeaderButton: false
     }
 
     // Slots