Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r975e1964b60365b24c74be139c6b84369a7248ce -r3688682c11b882e4794445e8c8e31c797faa7042
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 975e1964b60365b24c74be139c6b84369a7248ce)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 3688682c11b882e4794445e8c8e31c797faa7042)
@@ -53,9 +53,23 @@
     property int headerMenuIndex: _headerBar.headerMenuIndex
 
     onHeaderMenuIndexChanged: {
-        if ( _root.headerMenuIndex === 2)     page(_treatmentHeparin)
-        if ( _root.headerMenuIndex === 1)     page(_treatmentTrends)
-        if ( _root.headerMenuIndex === 0)     pop(null) // unwind stack
+        switch( _headerBar.currentScreen ) {
+        case MainMenu.Treatment:
+            pop(null)       // unwind stack back to main treatment
+            break
+        case MainMenu.Trends:
+            page( _treatmentTrends )
+            break;
+        case MainMenu.Heparin:
+            page( _treatmentHeparin )
+            break
+        case MainMenu.HDF:  // TODO
+            page( _treatmentHDF )
+            break
+        default:
+            pop(null)       // unwind stack back to main treatment
+            break
+        }
     }
 
     // Components
@@ -83,8 +97,15 @@
     }
 
     ScreenItem                  { id: _treatmentTrends      } // TODO: make me!
-    ScreenItem                  { id: _treatmentHeparin     } // 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    }