diff --git a/web/src/components/config-form/sections/BaseSection.tsx b/web/src/components/config-form/sections/BaseSection.tsx
index 9a2f710f7..8a35f4dff 100644
--- a/web/src/components/config-form/sections/BaseSection.tsx
+++ b/web/src/components/config-form/sections/BaseSection.tsx
@@ -996,7 +996,7 @@ export function ConfigSection({
               <Button
                 onClick={handleReset}
                 variant="outline"
-                disabled={isSaving || disabled}
+                disabled={isSaving || isSavingAll || disabled}
                 className="flex min-w-36 flex-1 gap-2"
               >
                 {t("button.undo", { ns: "common", defaultValue: "Undo" })}
diff --git a/web/src/pages/Settings.tsx b/web/src/pages/Settings.tsx
index 26e2f7f01..5f119a86c 100644
--- a/web/src/pages/Settings.tsx
+++ b/web/src/pages/Settings.tsx
@@ -1513,7 +1513,7 @@ export default function Settings() {
                     onClick={handleUndoAll}
                     variant="outline"
                     size="sm"
-                    disabled={isSavingAll}
+                    disabled={isSavingAll || isAnySectionSaving}
                     className="flex w-full items-center justify-center gap-2"
                   >
                     {t("button.undoAll", {
@@ -1525,7 +1525,11 @@ export default function Settings() {
                     onClick={handleSaveAll}
                     variant="select"
                     size="sm"
-                    disabled={isSavingAll || isAnySectionSaving || hasPendingValidationErrors}
+                    disabled={
+                      isSavingAll ||
+                      isAnySectionSaving ||
+                      hasPendingValidationErrors
+                    }
                     className="flex w-full items-center justify-center gap-2"
                   >
                     {isSavingAll ? (
@@ -1681,7 +1685,7 @@ export default function Settings() {
                 onClick={handleUndoAll}
                 variant="outline"
                 size="sm"
-                disabled={isSavingAll}
+                disabled={isSavingAll || isAnySectionSaving}
                 className="flex items-center justify-center gap-2"
               >
                 {t("button.undoAll", {
@@ -1693,7 +1697,11 @@ export default function Settings() {
                 variant="select"
                 size="sm"
                 onClick={handleSaveAll}
-                disabled={isSavingAll || isAnySectionSaving || hasPendingValidationErrors}
+                disabled={
+                  isSavingAll ||
+                  isAnySectionSaving ||
+                  hasPendingValidationErrors
+                }
                 className="flex items-center justify-center gap-2"
               >
                 {isSavingAll ? (
@@ -1850,6 +1858,8 @@ export default function Settings() {
                   onDeleteProfileSection={handleDeleteProfileForCurrentSection}
                   profilesUIEnabled={profilesUIEnabled}
                   setProfilesUIEnabled={setProfilesUIEnabled}
+                  isSavingAll={isSavingAll}
+                  onSectionSavingChange={handleSectionSavingChange}
                 />
               );
             })()}