diff --git a/FirmwareUpdateWindow.qml b/FirmwareUpdateWindow.qml
index e3777e853f..bc5a33c262 100644
--- a/FirmwareUpdateWindow.qml
+++ b/FirmwareUpdateWindow.qml
@@ -9,7 +9,7 @@ Rectangle
 
         Text 
         {
-            text: "Updating firmware"
+            text: manager.progress == 0 ? "Starting firmware update, may take a while.": manager.progress > 99 ? "Firmware update completed.": "Updating firmware."
         }
         ProgressBar 
         {
diff --git a/PrinterConnection.py b/PrinterConnection.py
index 57aedd55a4..28630dc0c5 100644
--- a/PrinterConnection.py
+++ b/PrinterConnection.py
@@ -410,7 +410,8 @@ class PrinterConnection(SignalEmitter):
     progressChanged = Signal()
     
     def setProgress(self, progress,max_progress = 100):
-        self._progress = progress
+        self._progress  = progress / max_progress * 100 #Convert to scale of 0-100
+        #self._progress = progress
         self.progressChanged.emit(self._progress, self._serial_port)
     
     def cancelPrint(self):