diff --git a/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx b/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
index aa21fb45..c58641fc 100644
--- a/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
+++ b/public/pages/workflow_detail/workflow_inputs/workflow_inputs.tsx
@@ -102,6 +102,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
     setTouched,
     values,
     touched,
+    dirty,
   } = useFormikContext<WorkflowFormValues>();
   const dispatch = useAppDispatch();
   const dataSourceId = getDataSourceId();
@@ -278,9 +279,36 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
     setIngestProvisioned(hasProvisionedIngestResources(props.workflow));
   }, [props.workflow]);
 
-  // Utility fn to update the workflow UI config only. A get workflow API call is subsequently run
-  // to fetch the updated state.
+  // maintain global states (button eligibility)
+  const ingestUndoButtonDisabled =
+    isRunningSave || isRunningIngest
+      ? true
+      : unsavedIngestProcessors
+      ? false
+      : !dirty;
+  const ingestSaveButtonDisabled = ingestUndoButtonDisabled;
+  const ingestRunButtonDisabled = !ingestTemplatesDifferent;
+  const ingestToSearchButtonDisabled =
+    ingestTemplatesDifferent || isRunningIngest;
+  const searchBackButtonDisabled =
+    isRunningSearch ||
+    (isProposingNoSearchResources ? false : searchTemplatesDifferent);
+  const searchUndoButtonDisabled =
+    isRunningSave || isRunningSearch
+      ? true
+      : unsavedSearchProcessors
+      ? false
+      : isEmpty(touched?.search) || !dirty;
+  const searchSaveButtonDisabled = searchUndoButtonDisabled;
+  const searchRunButtonDisabled =
+    isRunningSearch ||
+    (isProposingNoSearchResources &&
+      hasProvisionedSearchResources(props.workflow));
+
+  // Utility fn to update the workflow UI config only, based on the current form values.
+  // A get workflow API call is subsequently run to fetch the updated state.
   async function updateWorkflowUiConfig() {
+    let success = false;
     setIsRunningSave(true);
     const updatedTemplate = {
       name: props.workflow?.name,
@@ -302,6 +330,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
     )
       .unwrap()
       .then(async (result) => {
+        success = true;
         setUnsavedIngestProcessors(false);
         setUnsavedSearchProcessors(false);
         setTouched({});
@@ -320,6 +349,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
       .finally(() => {
         setIsRunningSave(false);
       });
+    return success;
   }
 
   // Utility fn to revert any unsaved changes, reset the form
@@ -342,7 +372,9 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
     reprovision: boolean
   ): Promise<boolean> {
     let success = false;
-    if (reprovision) {
+    if (!ingestTemplatesDifferent && !searchTemplatesDifferent) {
+      success = await updateWorkflowUiConfig();
+    } else if (reprovision) {
       await dispatch(
         updateWorkflow({
           apiBody: {
@@ -795,14 +827,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                         <EuiSmallButtonIcon
                           iconType="editorUndo"
                           aria-label="undo changes"
-                          isDisabled={
-                            isRunningSave || isRunningIngest
-                              ? true
-                              : unsavedIngestProcessors
-                              ? false
-                              : isEmpty(touched?.ingest?.enrich) &&
-                                isEmpty(touched?.ingest?.index)
-                          }
+                          isDisabled={ingestUndoButtonDisabled}
                           onClick={() => {
                             revertUnsavedChanges();
                           }}
@@ -810,14 +835,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                       </EuiFlexItem>
                       <EuiFlexItem grow={false}>
                         <EuiSmallButtonEmpty
-                          disabled={
-                            isRunningSave || isRunningIngest
-                              ? true
-                              : unsavedIngestProcessors
-                              ? false
-                              : isEmpty(touched?.ingest?.enrich) &&
-                                isEmpty(touched?.ingest?.index)
-                          }
+                          disabled={ingestSaveButtonDisabled}
                           isLoading={isRunningSave}
                           onClick={() => {
                             updateWorkflowUiConfig();
@@ -833,7 +851,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                             validateAndRunIngestion();
                           }}
                           data-testid="runIngestionButton"
-                          disabled={!ingestTemplatesDifferent}
+                          disabled={ingestRunButtonDisabled}
                           isLoading={isRunningIngest}
                         >
                           Build and run ingestion
@@ -846,7 +864,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                             setSelectedStep(STEP.SEARCH);
                           }}
                           data-testid="searchPipelineButton"
-                          disabled={ingestTemplatesDifferent || isRunningIngest}
+                          disabled={ingestToSearchButtonDisabled}
                         >
                           {`Search pipeline >`}
                         </EuiSmallButton>
@@ -856,12 +874,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                     <>
                       <EuiFlexItem grow={false}>
                         <EuiSmallButtonEmpty
-                          disabled={
-                            isRunningSearch ||
-                            (isProposingNoSearchResources
-                              ? false
-                              : searchTemplatesDifferent)
-                          }
+                          disabled={searchBackButtonDisabled}
                           onClick={() => setSelectedStep(STEP.INGEST)}
                         >
                           Back
@@ -871,13 +884,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                         <EuiSmallButtonIcon
                           iconType="editorUndo"
                           aria-label="undo changes"
-                          isDisabled={
-                            isRunningSave || isRunningSearch
-                              ? true
-                              : unsavedSearchProcessors
-                              ? false
-                              : isEmpty(touched?.search)
-                          }
+                          isDisabled={searchUndoButtonDisabled}
                           onClick={() => {
                             revertUnsavedChanges();
                           }}
@@ -885,13 +892,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                       </EuiFlexItem>
                       <EuiFlexItem grow={false}>
                         <EuiSmallButtonEmpty
-                          disabled={
-                            isRunningSave || isRunningSearch
-                              ? true
-                              : unsavedSearchProcessors
-                              ? false
-                              : isEmpty(touched?.search)
-                          }
+                          disabled={searchSaveButtonDisabled}
                           isLoading={isRunningSave}
                           onClick={() => {
                             updateWorkflowUiConfig();
@@ -902,11 +903,7 @@ export function WorkflowInputs(props: WorkflowInputsProps) {
                       </EuiFlexItem>
                       <EuiFlexItem grow={false}>
                         <EuiSmallButton
-                          disabled={
-                            isRunningSearch ||
-                            (isProposingNoSearchResources &&
-                              hasProvisionedSearchResources(props.workflow))
-                          }
+                          disabled={searchRunButtonDisabled}
                           isLoading={isRunningSearch}
                           fill={false}
                           onClick={() => {