Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r8ff1852fbcf348761fd30f878f31fa43ffa9e37c
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 8ff1852fbcf348761fd30f878f31fa43ffa9e37c)
@@ -56,16 +56,16 @@
     onHeaderMenuIndexChanged: {
         switch( _headerBar.currentScreen ) {
         case MainMenu.Treatment:
-            pop(null)   // unwind stack
+            page( _treatmentHome )
             break
         case MainMenu.Trends:
-            page(_treatmentTrends)
+            page( _treatmentTrends )
             break;
         case MainMenu.Heparin:
-            page(_treatmentHeparin)
+            page( _treatmentHeparin )
             break
         case MainMenu.HDF:  // TODO
-             page(_treatmentHDF)
+            page( _treatmentHDF )
             break
         default:
             pop(null)
@@ -99,9 +99,14 @@
 
     ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
     TreatmentHeparin            { id: _treatmentHeparin     }
+    Connections { target: _treatmentHeparin
+        function onIdleTimeout  ( ) {
+            _headerBar.headerMenuIndex = MainMenu.Treatment // on heparin idle timeout go to main treatment
+        }
+    }
+
     ScreenItem                  { id: _treatmentHDF         } // TODO: make me!
 
-
     //// Treatment Adjustment Dialogs
     TreatmentAdjustmentFlow             { id:       _treatmentAdjustmentFlow    }
     TreatmentAdjustmentPressuresLimits  { id:       _treatmentAdjustmentPressuresLimits    }