diff --git a/esphome/dashboard/static/esphome.js b/esphome/dashboard/static/esphome.js
index 39a060feb7..85a0d3c842 100644
--- a/esphome/dashboard/static/esphome.js
+++ b/esphome/dashboard/static/esphome.js
@@ -412,21 +412,21 @@ const downloadAfterUploadButton = document.querySelector('.download-after-upload
 const uploadModal = new LogModalElem({
   name: 'upload',
   onPrepare: (modalElem, config) => {
-    retryUploadButton.setAttribute('data-node', uploadModal.activeConfig);
-    retryUploadButton.classList.add('hide');
-    editAfterUploadButton.setAttribute('data-node', uploadModal.activeConfig);
-    downloadAfterUploadButton.classList.remove('hide');
     downloadAfterUploadButton.classList.add('disabled');
+    retryUploadButton.setAttribute('data-node', uploadModal.activeConfig);
+    retryUploadButton.classList.add('disabled');
+    editAfterUploadButton.setAttribute('data-node', uploadModal.activeConfig);
     modalElem.querySelector(".stop-logs").innerHTML = "Stop";
   },
   onProcessExit: (modalElem, code) => {
     if (code === 0) {
       M.toast({html: "Program exited successfully."});
+      // if compilation succeeds but OTA fails, you can still download the binary and upload manually
       downloadAfterUploadButton.classList.remove('disabled');
     } else {
       M.toast({html: `Program failed with code ${code}`});
-      downloadAfterUploadButton.classList.add('hide');
-      retryUploadButton.classList.remove('hide');
+      downloadAfterUploadButton.classList.add('disabled');
+      retryUploadButton.classList.remove('disabled');
     }
     modalElem.querySelector(".stop-logs").innerHTML = "Close";
   },
diff --git a/esphome/dashboard/templates/index.html b/esphome/dashboard/templates/index.html
index a39d56d116..3c2adad8d2 100644
--- a/esphome/dashboard/templates/index.html
+++ b/esphome/dashboard/templates/index.html
@@ -122,8 +122,8 @@
       <i class="material-icons flash-using-esphomeflasher">help_outline</i>
     </a>
     <a class="modal-close waves-effect waves-green btn-flat disabled download-after-upload">Download Binary</a>
+    <a class="waves-effect waves-green btn-flat disabled action-upload retry-upload">Retry</a>
     <a class="modal-close waves-effect waves-green btn-flat action-edit edit-after-upload">Edit</a>
-    <a class="waves-effect waves-green btn-flat hide action-upload retry-upload">Retry</a>
     <a class="modal-close waves-effect waves-green btn-flat stop-logs">Stop</a>
   </div>
 </div>