Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -rd27d1a0cd3a0dd7ac8a7dd5cf1a66ca0e038e8dd -rca05e940ea4a0c567acb05c4c8777dea079b0f08
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision d27d1a0cd3a0dd7ac8a7dd5cf1a66ca0e038e8dd)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
@@ -35,11 +35,12 @@
     property bool isRunning     : vTDTreatmentStates.txDialysis &&
                                !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning )
 
-    property bool isComplete    : vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0
+    property bool isComplete    : ( vTreatmentTime.time_Remaining <= 0 && vTreatmentTime.time_Elapsed > 0 ) ||  vTDTreatmentStates.txEnd
 
-    property string notificationText:   ! isRunning ? qsTr("Treatment Paused")  :
-                                        isComplete  ? qsTr("Treatment Complete"):
+    property string notificationText:   isComplete  ? qsTr("Treatment Complete"):
+                                        ! isRunning ? qsTr("Treatment Paused")  :
                                                       ""
+    property alias editEnabled: _editTimeIcon.enabled
 
     color   : "transparent"
     width   : _circle.width
@@ -61,7 +62,7 @@
 
         MouseArea { id: _mouseArea
             anchors.fill    : parent
-            onClicked       : _root.clicked()
+            onClicked       : if ( editEnabled ) { _root.clicked() }
         }
     }
 
@@ -110,7 +111,7 @@
                 horizontalCenter: parent.horizontalCenter
             }
             iconSize            : 30
-            iconImageSource     : "qrc:/images/iEdit"
+            iconImageSource     : enabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
             onClicked           : _root.clicked()
         }
     }