diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml
index 3da149486c11c1dfbc837a9de86bbaac45f1a028..2c6402088a9c9e5547683930e8b3b83ceff59af3 100644
--- a/src/PlanView/PlanToolBar.qml
+++ b/src/PlanView/PlanToolBar.qml
@@ -300,8 +300,8 @@ Rectangle {
         anchors.verticalCenter: parent.verticalCenter
         text:                   _controllerDirty ? qsTr("Upload Required") : qsTr("Upload")
         enabled:                !_controllerSyncInProgress
-        visible:                !_controllerOffline
-        primary:                _controllerDirty && !_controllerSyncInProgress
+        visible:                !_controllerOffline && !_controllerSyncInProgress && !uploadCompleteText.visible
+        primary:                _controllerDirty
         onClicked:              planMasterController.upload()
 
         PropertyAnimation on opacity {