diff --git a/system/src/Grav/Common/Upgrade/SafeUpgradeService.php b/system/src/Grav/Common/Upgrade/SafeUpgradeService.php
index cf0e0cce2..a7913b4b9 100644
--- a/system/src/Grav/Common/Upgrade/SafeUpgradeService.php
+++ b/system/src/Grav/Common/Upgrade/SafeUpgradeService.php
@@ -221,7 +221,12 @@ class SafeUpgradeService
                 continue;
             }
 
-            $entries[] = $fileinfo->getFilename();
+            $name = $fileinfo->getFilename();
+            if (in_array($name, $this->ignoredDirs, true)) {
+                continue;
+            }
+
+            $entries[] = $name;
         }
 
         sort($entries);
@@ -268,7 +273,7 @@ class SafeUpgradeService
                     $index + 1,
                     max($total, 1)
                 );
-                $percent = $total > 0 ? (int)floor(($index / $total) * 100) : null;
+                $percent = $total > 0 ? (int)floor((($index + 1) / $total) * 100) : null;
                 $this->reportProgress($progressStage, $message, $percent ?: null, [
                     'entry' => $entry,
                     'index' => $index + 1,