diff --git a/app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx b/app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx
index 5eee431a27..8a94c99ac2 100644
--- a/app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx
+++ b/app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx
@@ -212,11 +212,9 @@ export const ReorderFieldsModal: FC<DialogModalProps> = ({ onClose }) => {
         return;
       }
       newFields.push({ name: field.name, value: field.value });
-
-      void dispatch(patchProfile({ fields_attributes: newFields })).then(
-        onClose,
-      );
     }
+
+    void dispatch(patchProfile({ fields_attributes: newFields })).then(onClose);
   }, [dispatch, fieldKeys, fields, onClose]);
 
   const emojis = useAppSelector((state) => state.custom_emojis);
diff --git a/app/javascript/mastodon/reducers/slices/profile_edit.ts b/app/javascript/mastodon/reducers/slices/profile_edit.ts
index e4840c642d..62a908e5b1 100644
--- a/app/javascript/mastodon/reducers/slices/profile_edit.ts
+++ b/app/javascript/mastodon/reducers/slices/profile_edit.ts
@@ -221,7 +221,12 @@ export const patchProfile = createDataLoadingThunk(
   `${profileEditSlice.name}/patchProfile`,
   (params: Partial<ApiProfileUpdateParams>) => apiPatchProfile(params),
   transformProfile,
-  { useLoadingBar: false },
+  {
+    useLoadingBar: false,
+    condition(_, { getState }) {
+      return !getState().profileEdit.isPending;
+    },
+  },
 );
 
 export const selectFieldById = createAppSelector(