diff --git a/frontend/src/tools/Automate.tsx b/frontend/src/tools/Automate.tsx
index 54538781b..af6b3d411 100644
--- a/frontend/src/tools/Automate.tsx
+++ b/frontend/src/tools/Automate.tsx
@@ -33,13 +33,19 @@ const Automate = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
     if (currentStep === AUTOMATION_STEPS.RUN && data.step !== AUTOMATION_STEPS.RUN) {
       automateOperation.resetResults();
     }
-    
+
+    // If navigating to selection step, always clear results
+    if (data.step === AUTOMATION_STEPS.SELECTION) {
+      automateOperation.resetResults();
+      automateOperation.clearError();
+    }
+
     // If navigating to run step with a different automation, reset results
-    if (data.step === AUTOMATION_STEPS.RUN && data.automation && 
+    if (data.step === AUTOMATION_STEPS.RUN && data.automation &&
         stepData.automation && data.automation.id !== stepData.automation.id) {
       automateOperation.resetResults();
     }
-    
+
     setStepData(data);
     setCurrentStep(data.step);
   };
@@ -47,7 +53,7 @@ const Automate = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   const handleComplete = () => {
     // Reset automation results when completing
     automateOperation.resetResults();
-    
+
     // Reset to selection step
     setCurrentStep(AUTOMATION_STEPS.SELECTION);
     setStepData({ step: AUTOMATION_STEPS.SELECTION });
@@ -127,7 +133,12 @@ const Automate = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
     createStep(t('automate.selection.title', 'Automation Selection'), {
       isVisible: true,
       isCollapsed: currentStep !== AUTOMATION_STEPS.SELECTION,
-      onCollapsedClick: () => setCurrentStep(AUTOMATION_STEPS.SELECTION)
+      onCollapsedClick: () => {
+        // Clear results when clicking back to selection
+        automateOperation.resetResults();
+        setCurrentStep(AUTOMATION_STEPS.SELECTION);
+        setStepData({ step: AUTOMATION_STEPS.SELECTION });
+      }
     }, currentStep === AUTOMATION_STEPS.SELECTION ? renderCurrentStep() : null),
 
     createStep(stepData.mode === AutomationMode.EDIT
@@ -158,7 +169,7 @@ const Automate = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
     },
     steps: automationSteps,
     review: {
-      isVisible: hasResults,
+      isVisible: hasResults && currentStep === AUTOMATION_STEPS.RUN,
       operation: automateOperation,
       title: t('automate.reviewTitle', 'Automation Results')
     }