diff --git a/frontend/src/components/config/index.tsx b/frontend/src/components/config/index.tsx
index ff03a6f4b..706c6e844 100644
--- a/frontend/src/components/config/index.tsx
+++ b/frontend/src/components/config/index.tsx
@@ -29,6 +29,7 @@ export const ConfigLayout = <
   children,
   disabled,
   onConfirm,
+  isSavePending,
   onReset,
   selector,
   titleOther,
@@ -39,6 +40,7 @@ export const ConfigLayout = <
   children: ReactNode;
   disabled: boolean;
   onConfirm: () => void;
+  isSavePending: boolean;
   onReset: () => void;
   selector?: ReactNode;
   titleOther?: ReactNode;
@@ -75,6 +77,7 @@ export const ConfigLayout = <
                 previous={original}
                 content={update}
                 onConfirm={async () => onConfirm()}
+                loading={isSavePending}
                 disabled={disabled}
                 file_contents_language={file_contents_language}
                 key_listener
@@ -121,6 +124,7 @@ export const Config = <T,>({
   disableSidebar,
   set,
   onSave,
+  isSavePending,
   components,
   selector,
   titleOther,
@@ -132,6 +136,7 @@ export const Config = <T,>({
   disableSidebar?: boolean;
   set: React.Dispatch<SetStateAction<Partial<T>>>;
   onSave: () => Promise<void>;
+  isSavePending: boolean,
   selector?: ReactNode;
   titleOther?: ReactNode;
   components: Record<
@@ -154,6 +159,7 @@ export const Config = <T,>({
       update={update}
       disabled={disabled}
       onConfirm={onConfirm}
+      isSavePending={isSavePending}
       onReset={onReset}
       selector={selector}
       file_contents_language={file_contents_language}
@@ -199,6 +205,7 @@ export const Config = <T,>({
                     onConfirm={onConfirm}
                     disabled={disabled || !changesMade}
                     file_contents_language={file_contents_language}
+                    loading={isSavePending}
                   />
                   <Button
                     variant="outline"
@@ -331,6 +338,7 @@ export const Config = <T,>({
                 previous={original}
                 content={update}
                 onConfirm={onConfirm}
+                loading={isSavePending}
                 disabled={disabled}
                 file_contents_language={file_contents_language}
               />
diff --git a/frontend/src/components/resources/action/config.tsx b/frontend/src/components/resources/action/config.tsx
index 79c855f1c..a1088bef2 100644
--- a/frontend/src/components/resources/action/config.tsx
+++ b/frontend/src/components/resources/action/config.tsx
@@ -45,7 +45,7 @@ export const ActionConfig = ({ id }: { id: string }) => {
     `action-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateAction");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateAction");
   const { integrations } = useWebhookIntegrations();
   const [id_or_name] = useWebhookIdOrName();
 
@@ -63,6 +63,7 @@ export const ActionConfig = ({ id }: { id: string }) => {
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
diff --git a/frontend/src/components/resources/alerter/config/index.tsx b/frontend/src/components/resources/alerter/config/index.tsx
index c3aa49a61..1e43c6c31 100644
--- a/frontend/src/components/resources/alerter/config/index.tsx
+++ b/frontend/src/components/resources/alerter/config/index.tsx
@@ -11,7 +11,7 @@ export const AlerterConfig = ({ id }: { id: string }) => {
   const config = useRead("GetAlerter", { alerter: id }).data?.config;
   const global_disabled =
     useRead("GetCoreInfo", {}).data?.ui_write_disabled ?? false;
-  const { mutateAsync } = useWrite("UpdateAlerter");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateAlerter");
   const [update, set] = useLocalStorage<Partial<Types.AlerterConfig>>(
     `alerter-${id}-update-v1`,
     {}
@@ -29,6 +29,7 @@ export const AlerterConfig = ({ id }: { id: string }) => {
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
diff --git a/frontend/src/components/resources/build/config.tsx b/frontend/src/components/resources/build/config.tsx
index 3fccb8af0..fc39c4fb6 100644
--- a/frontend/src/components/resources/build/config.tsx
+++ b/frontend/src/components/resources/build/config.tsx
@@ -81,7 +81,7 @@ export const BuildConfig = ({
     `build-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateBuild");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateBuild");
   const { integrations } = useWebhookIntegrations();
   const [id_or_name] = useWebhookIdOrName();
 
@@ -733,6 +733,7 @@ export const BuildConfig = ({
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={components}
       file_contents_language="dockerfile"
     />
diff --git a/frontend/src/components/resources/builder/config.tsx b/frontend/src/components/resources/builder/config.tsx
index 80a5cdf2d..2204fb6e2 100644
--- a/frontend/src/components/resources/builder/config.tsx
+++ b/frontend/src/components/resources/builder/config.tsx
@@ -35,7 +35,7 @@ const AwsBuilderConfig = ({ id }: { id: string }) => {
     `aws-builder-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateBuilder");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateBuilder");
   if (!config) return null;
 
   const disabled = global_disabled || !canWrite;
@@ -49,6 +49,7 @@ const AwsBuilderConfig = ({ id }: { id: string }) => {
       onSave={async () => {
         await mutateAsync({ id, config: { type: "Aws", params: update } });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
@@ -245,7 +246,7 @@ const ServerBuilderConfig = ({ id }: { id: string }) => {
     `server-builder-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateBuilder");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateBuilder");
   if (!config) return null;
 
   const disabled = !canWrite;
@@ -259,6 +260,7 @@ const ServerBuilderConfig = ({ id }: { id: string }) => {
       onSave={async () => {
         await mutateAsync({ id, config: { type: "Server", params: update } });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
@@ -305,7 +307,7 @@ const UrlBuilderConfig = ({ id }: { id: string }) => {
     `url-builder-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateBuilder");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateBuilder");
   if (!config) return null;
 
   const disabled = !canWrite;
@@ -319,6 +321,7 @@ const UrlBuilderConfig = ({ id }: { id: string }) => {
       onSave={async () => {
         await mutateAsync({ id, config: { type: "Url", params: update } });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
diff --git a/frontend/src/components/resources/deployment/config/index.tsx b/frontend/src/components/resources/deployment/config/index.tsx
index 801941d2a..120dc7086 100644
--- a/frontend/src/components/resources/deployment/config/index.tsx
+++ b/frontend/src/components/resources/deployment/config/index.tsx
@@ -39,7 +39,7 @@ export const DeploymentConfig = ({
     `deployment-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateDeployment");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateDeployment");
 
   if (!config) return null;
 
@@ -59,6 +59,7 @@ export const DeploymentConfig = ({
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
diff --git a/frontend/src/components/resources/procedure/config.tsx b/frontend/src/components/resources/procedure/config.tsx
index e8deb690a..87d5650e8 100644
--- a/frontend/src/components/resources/procedure/config.tsx
+++ b/frontend/src/components/resources/procedure/config.tsx
@@ -136,7 +136,7 @@ export const ProcedureConfig = ({ id }: { id: string }) => {
     `procedure-${id}-update-v1`,
     {},
   );
-  const { mutateAsync } = useWrite("UpdateProcedure");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateProcedure");
   const { integrations } = useWebhookIntegrations();
   const [id_or_name] = useWebhookIdOrName();
 
@@ -161,6 +161,7 @@ export const ProcedureConfig = ({ id }: { id: string }) => {
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
diff --git a/frontend/src/components/resources/repo/config.tsx b/frontend/src/components/resources/repo/config.tsx
index 185d06e72..ee184e89a 100644
--- a/frontend/src/components/resources/repo/config.tsx
+++ b/frontend/src/components/resources/repo/config.tsx
@@ -39,7 +39,7 @@ export const RepoConfig = ({ id }: { id: string }) => {
     `repo-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateRepo");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateRepo");
   const { integrations } = useWebhookIntegrations();
   const [id_or_name] = useWebhookIdOrName();
 
@@ -59,6 +59,7 @@ export const RepoConfig = ({ id }: { id: string }) => {
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={{
         "": [
           {
diff --git a/frontend/src/components/resources/resource-sync/config.tsx b/frontend/src/components/resources/resource-sync/config.tsx
index da324bebf..85d7cdd2c 100644
--- a/frontend/src/components/resources/resource-sync/config.tsx
+++ b/frontend/src/components/resources/resource-sync/config.tsx
@@ -85,7 +85,7 @@ export const ResourceSyncConfig = ({
     `sync-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateResourceSync");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateResourceSync");
   const { integrations } = useWebhookIntegrations();
   const [id_or_name] = useWebhookIdOrName();
 
@@ -581,6 +581,7 @@ export const ResourceSyncConfig = ({
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={components}
       file_contents_language="fancy_toml"
     />
diff --git a/frontend/src/components/resources/server/config.tsx b/frontend/src/components/resources/server/config.tsx
index 2b53d7c5d..cacab0edf 100644
--- a/frontend/src/components/resources/server/config.tsx
+++ b/frontend/src/components/resources/server/config.tsx
@@ -27,7 +27,7 @@ export const ServerConfig = ({
     `server-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateServer", {
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateServer", {
     onSuccess: () => {
       // In case of disabling to resolve unreachable alert
       invalidate(["ListAlerts"]);
@@ -43,6 +43,7 @@ export const ServerConfig = ({
       disabled={disabled}
       original={config}
       update={update}
+      isSavePending={isSavePending}
       set={set}
       onSave={async () => {
         await mutateAsync({ id, config: update });
diff --git a/frontend/src/components/resources/stack/config.tsx b/frontend/src/components/resources/stack/config.tsx
index 2af22c910..df05a9132 100644
--- a/frontend/src/components/resources/stack/config.tsx
+++ b/frontend/src/components/resources/stack/config.tsx
@@ -101,7 +101,7 @@ export const StackConfig = ({
     `stack-${id}-update-v1`,
     {}
   );
-  const { mutateAsync } = useWrite("UpdateStack");
+  const { mutateAsync, isPending: isSavePending } = useWrite("UpdateStack");
   const { integrations } = useWebhookIntegrations();
   const [id_or_name] = useWebhookIdOrName();
 
@@ -906,6 +906,7 @@ export const StackConfig = ({
       onSave={async () => {
         await mutateAsync({ id, config: update });
       }}
+      isSavePending={isSavePending}
       components={components}
       file_contents_language="yaml"
     />