diff --git a/TODO.md b/TODO.md
index e01cf3f4..5bf41ae0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,6 @@
 
 - add faq entry about range and antennas and rain
 - first message sent is still doubled for some people
-- disable software update button after update finishes
 - let users set arbitrary params in android
 - add a low level settings screen (let user change any of the RadioConfig parameters)
 
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 5c7f95f0..5932afa0 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -484,10 +484,12 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
                     updateProgressBar.progress = service.updateStatus
                     delay(2000) // Only check occasionally
                 }
+
+                val isSuccess = (service.updateStatus == -1)
                 scanStatusText.text =
-                    if (service.updateStatus == -1) "Update successful" else "Update failed"
+                    if (isSuccess) "Update successful" else "Update failed"
                 updateProgressBar.isEnabled = false
-                updateFirmwareButton.isEnabled = true
+                updateFirmwareButton.isEnabled = !isSuccess
             }
         }
     }