diff --git a/src/components/cost-estimator/cost-estimator-form.tsx b/src/components/cost-estimator/cost-estimator-form.tsx
index 79605fe..69a21cd 100644
--- a/src/components/cost-estimator/cost-estimator-form.tsx
+++ b/src/components/cost-estimator/cost-estimator-form.tsx
@@ -69,13 +69,21 @@ export function CostEstimatorForm() {
 
   const handleNextStep = () => {
     startTransition(() => {
+      if (currentStep === 2 && formData.serviceType === 'development') {
+        setCurrentStep(5);
+      } else {
         setCurrentStep((prev) => prev + 1);
+      }
     });
   };
 
   const handlePrevStep = () => {
     startTransition(() => {
+      if (currentStep === 5 && formData.serviceType === 'development') {
+        setCurrentStep(2);
+      } else {
         setCurrentStep((prev) => prev - 1);
+      }
     });
   };