Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rd62949c62c5512952e86a427285ef0dc72344248 -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision d62949c62c5512952e86a427285ef0dc72344248)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -6,7 +6,6 @@
 
 Rectangle { id: _root
 
-    property alias menuHidden               : _headerMenu.hidden
     property alias headerMenuIndex          : _headerMenu.index
     property alias userMode                 : _loggedInUser.text
     readonly property int currentScreen     : _headerMenu.currentScreen
@@ -153,7 +152,10 @@
         }
         height          : parent.height
         width           : parent.width / 2 // gives the width of the headerbar menu
-        hidden          : true
+        hidden          :  _root.activeStack &&
+                           _root.activeStack.currentItem &&
+                           _root.activeStack.currentItem.showHeaderMenu ? ! _root.activeStack.currentItem.showHeaderMenu : true
+        visible         : ! hidden
         titlePixelSize  : 32
         backgroundColor : Colors.transparent
         highlightHeight : 15
Index: sources/gui/qml/components/ScreenItem.qml
===================================================================
diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/components/ScreenItem.qml	(.../ScreenItem.qml)	(revision 07121b02499a4c929c5b5e8bd804a67539574c1b)
+++ sources/gui/qml/components/ScreenItem.qml	(.../ScreenItem.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -27,6 +27,7 @@
     property alias backgroundRect           : _backgroundRect
     property string headerTitle             : ""
     property bool showCreateRxHeaderButton  : false
+    property bool showHeaderMenu            : false
 
     visible: false
     width  : Variables.applicationWidth
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
===================================================================
diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml	(.../EndTreatmentRecirculateStack.qml)	(revision c1651f840faf3ed767fb19b76742b68401f96272)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml	(.../EndTreatmentRecirculateStack.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -45,7 +45,6 @@
     onVisibleChanged: {
         if (visible) {
             _headerBar.activeStack = stackView
-            _headerBar.menuHidden = true
         }
         else {
             stackView.initialItem = null
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
===================================================================
diff -u -rbb2557d984b23c29426f452968ea797e6559ac3b -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml	(.../EndTreatmentRinsebackStack.qml)	(revision bb2557d984b23c29426f452968ea797e6559ac3b)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml	(.../EndTreatmentRinsebackStack.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -34,7 +34,6 @@
     onVisibleChanged: {
         if (visible) {
             _headerBar.activeStack = stackView
-            _headerBar.menuHidden = true
         }
         else {
             stackView.initialItem = null
Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml
===================================================================
diff -u -r5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml	(.../TreatmentBloodPrime.qml)	(revision 5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a)
+++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml	(.../TreatmentBloodPrime.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -36,7 +36,6 @@
 
     onVisibleChanged: {
         if (visible) {
-            _headerBar.menuHidden = true
         }
     }
 
Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml
===================================================================
diff -u -rdff07fba403deec1ee04b2b6bde24d7b0cd0b8a1 -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision dff07fba403deec1ee04b2b6bde24d7b0cd0b8a1)
+++ sources/gui/qml/pages/treatment/TreatmentHDF.qml	(.../TreatmentHDF.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -43,6 +43,7 @@
 
     onHdfStateChanged       : setStatusColor()
     showCreateRxHeaderButton: true
+    showHeaderMenu          : true
 
     signal sectionPressuresClicked()
     signal treatmentHDFEditClicked()
Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml
===================================================================
diff -u -r320972a712c31e94413056591634859b4b3d564e -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 320972a712c31e94413056591634859b4b3d564e)
+++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml	(.../TreatmentHeparin.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -55,6 +55,7 @@
     readonly property real target           : vTreatmentHeparin.target
     readonly property string timeRemaining  : vTreatmentHeparin.timeRemaining
     showCreateRxHeaderButton                : true
+    showHeaderMenu                          : true
 
     signal idleTimeout()
 
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -32,10 +32,10 @@
     property int          bloodFlow_MeasuredFlow_Precision: 0
     property int dialysateInletFlow_MeasuredFlow_Precision: 0
     showCreateRxHeaderButton: true
+    showHeaderMenu          : true
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true
-            _headerBar.menuHidden = false
         }
     }
 
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision c1651f840faf3ed767fb19b76742b68401f96272)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -47,7 +47,6 @@
             _headerBar.activeStack = stackView
         }
         else {
-            _headerBar.menuHidden = true
             stackView.initialItem = null
         }
     }
@@ -309,10 +308,7 @@
     Connections { target: vTDTreatmentStates
         // in-Treatmet
         function onTxBloodPrimeChanged              ( vValue ) { page( _treatmentBloodPrime             , vValue    )}
-        function onTxDialysisChanged                ( vValue ) { page( _treatmentHome                   , _headerBar.headerMenuIndex === HeaderBar.Treatment && vValue    )
-
-                                                                print(" _headerBar.headerMenuIndex " +  _headerBar.headerMenuIndex)
-                                                                }
+        function onTxDialysisChanged                ( vValue ) { page( _treatmentHome                   ,  vValue &&  _headerBar.currentScreen === HeaderBar.Treatment ) }
         function onTxEndChanged                     ( vValue ) { if ( vValue ) {  _endTreatmentDialog.open()        }}
         function onTxRinsebackChanged               ( vValue ) { page( _endTreatmentRinsebackStack      , vValue    )}
         function onTxRecirculateChanged             ( vValue ) { page( _endTreatmentRecirculateStack    , vValue    )}
Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml
===================================================================
diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r9b6a2029835c67d61267fad0483a22a916a5eb2f
--- sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
+++ sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision 9b6a2029835c67d61267fad0483a22a916a5eb2f)
@@ -30,6 +30,7 @@
     objectName: "_TreatmentTrends"
     property alias isParamExpanded: _paramArea.isExpanded
     showCreateRxHeaderButton: true
+    showHeaderMenu          : true
 
     onVisibleChanged: {
         _paramList.positionViewAtBeginning()