diff --git a/manage.css b/manage.css
index 5faa7ec9..e78a6e5c 100644
--- a/manage.css
+++ b/manage.css
@@ -444,6 +444,24 @@ input[id^="manage.newUI"] {
   display: none;
 }
 
+#apply-all-updates:after {
+  content: " (" attr(data-value) ")";
+}
+
+#check-all-updates[disabled] {
+  position: relative;
+}
+
+#check-all-updates[disabled] #update-progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  background-color: currentColor;
+  content: "";
+  opacity: .35;
+}
+
 /* highlight updated/added styles */
 .highlight {
   animation: highlight 10s cubic-bezier(0,.82,.47,.98);
diff --git a/manage.html b/manage.html
index ba05f28e..ff787a50 100644
--- a/manage.html
+++ b/manage.html
@@ -134,7 +134,7 @@
     <input id="search" type="search" i18n-placeholder="searchStyles">
   </fieldset>
   <p>
-    <button id="check-all-updates" i18n-text="checkAllUpdates"></button>
+    <button id="check-all-updates" i18n-text="checkAllUpdates"><span id="update-progress"></span></button>
   </p>
   <p>
     <button id="apply-all-updates" class="hidden" i18n-text="applyAllUpdates"></button>
diff --git a/manage.js b/manage.js
index dcc3be73..c514d8ee 100644
--- a/manage.js
+++ b/manage.js
@@ -365,7 +365,7 @@ function handleUpdate(style, {reason} = {}) {
     if (reason == 'update') {
       element.classList.add('update-done');
       element.classList.remove('can-update', 'updatable');
-      $('.update-note', element).innerHTML = t('updateCompleted');
+      $('.update-note', element).textContent = t('updateCompleted');
       renderUpdatesOnlyFilter();
     }
   }
@@ -444,13 +444,12 @@ function applyUpdateAll() {
   const btnApply = $('#apply-all-updates');
   btnApply.disabled = true;
   setTimeout(() => {
-    btnApply.style.display = 'none';
+    btnApply.classList.add('hidden');
     btnApply.disabled = false;
   }, 1000);
 
   $$('.can-update .update').forEach(button => {
-    // align to the bottom of the visible area if wasn't visible
-    button.scrollIntoView(false);
+    scrollElementIntoView(button);
     button.click();
   });
 
@@ -462,37 +461,51 @@ function checkUpdateAll() {
   const btnCheck = $('#check-all-updates');
   const btnApply = $('#apply-all-updates');
   const noUpdates = $('#update-all-no-updates');
+  const progress = $('#update-progress');
 
   btnCheck.disabled = true;
   btnApply.classList.add('hidden');
   noUpdates.classList.add('hidden');
+  const maxWidth = progress.parentElement.clientWidth;
 
-  Promise.all($$('.updatable:not(.can-update)').map(checkUpdate))
-    .then(updatables => {
-      btnCheck.disabled = false;
-      const numUpdatable = updatables.filter(u => u).length;
-      if (numUpdatable) {
-        btnApply.classList.remove('hidden');
-        btnApply.originalLabel = btnApply.originalLabel || btnApply.textContent;
-        btnApply.textContent = btnApply.originalLabel + ` (${numUpdatable})`;
-        renderUpdatesOnlyFilter({check: true});
-      } else {
-        noUpdates.classList.remove('hidden');
-        setTimeout(() => {
-          noUpdates.classList.add('hidden');
-        }, 10e3);
-      }
-    });
-
+  const queue = $$('.updatable:not(.can-update)').map(checkUpdate);
+  const total = queue.length;
+  let updatesFound = false;
+  let checked = 0;
+  processQueue();
   // notify the automatic updater to reset the next automatic update accordingly
   chrome.runtime.sendMessage({
     method: 'resetInterval'
   });
+
+  function processQueue(status) {
+    if (status === true) {
+      updatesFound = true;
+      btnApply.disabled = true;
+      btnApply.classList.remove('hidden');
+      renderUpdatesOnlyFilter({check: true});
+    }
+    if (checked < total) {
+      queue[checked++].then(status => {
+        progress.style.width = Math.round(checked / total * maxWidth) + 'px';
+        setTimeout(processQueue, 0, status);
+      });
+      return;
+    }
+    btnCheck.disabled = false;
+    btnApply.disabled = false;
+    if (!updatesFound) {
+      noUpdates.classList.remove('hidden');
+      setTimeout(() => {
+        noUpdates.classList.add('hidden');
+      }, 10e3);
+    }
+  }
 }
 
 
 function checkUpdate(element) {
-  $('.update-note', element).innerHTML = t('checkingForUpdate');
+  $('.update-note', element).textContent = t('checkingForUpdate');
   $('.check-update', element).title = '';
   element.classList.remove('checking-update', 'no-update', 'update-problem');
   element.classList.add('checking-update');
@@ -563,12 +576,12 @@ class Updater {
     if (json) {
       this.element.classList.add('can-update');
       this.element.updatedCode = json;
-      $('.update-note', this.element).innerHTML = '';
+      $('.update-note', this.element).textContent = '';
       $('#onlyUpdates').classList.remove('hidden');
     } else {
       this.element.classList.add('no-update');
       this.element.classList.toggle('update-problem', Boolean(message));
-      $('.update-note', this.element).innerHTML = message || t('updateCheckSucceededNoUpdate');
+      $('.update-note', this.element).textContent = message || t('updateCheckSucceededNoUpdate');
       if (newUI.enabled) {
         $('.check-update', this.element).title = message;
       }
@@ -614,7 +627,7 @@ function renderUpdatesOnlyFilter({show, check} = {}) {
   const btnApply = $('#apply-all-updates');
   if (!btnApply.matches('.hidden')) {
     if (canUpdate) {
-      btnApply.textContent = btnApply.originalLabel + ` (${numUpdatable})`;
+      btnApply.dataset.value = numUpdatable;
     } else {
       btnApply.classList.add('hidden');
     }