diff --git a/frontend/src/components/domain/onboarding/UnifiedOnboardingWizard.tsx b/frontend/src/components/domain/onboarding/UnifiedOnboardingWizard.tsx
index dfb6cd90..eb898e41 100644
--- a/frontend/src/components/domain/onboarding/UnifiedOnboardingWizard.tsx
+++ b/frontend/src/components/domain/onboarding/UnifiedOnboardingWizard.tsx
@@ -205,6 +205,7 @@ const OnboardingWizardContent: React.FC = () => {
   const isNewTenant = searchParams.get('new') === 'true';
   const [currentStepIndex, setCurrentStepIndex] = useState(0);
   const [isInitialized, setIsInitialized] = useState(isNewTenant);
+  const [canContinue, setCanContinue] = useState(true); // Track if current step allows continuation
 
   useTenantInitializer();
 
@@ -407,6 +408,11 @@ const OnboardingWizardContent: React.FC = () => {
   };
 
   const handleStepUpdate = (data?: any) => {
+    // Handle canContinue state updates from setup wizard steps
+    if (data?.canContinue !== undefined) {
+      setCanContinue(data.canContinue);
+    }
+
     // Handle intermediate updates without marking step complete
     if (currentStep.id === 'bakery-type-selection' && data?.bakeryType) {
       wizardContext.updateBakeryType(data.bakeryType as BakeryType);
@@ -538,6 +544,48 @@ const OnboardingWizardContent: React.FC = () => {
             isLastStep={currentStepIndex === VISIBLE_STEPS.length - 1}
           />
         </CardBody>
+
+        {/* Navigation Footer - Only for setup wizard steps that don't render their own buttons */}
+        {['suppliers-setup', 'inventory-setup', 'recipes-setup', 'quality-setup', 'team-setup', 'setup-review'].includes(currentStep.id) && (
+          <div className="border-t border-[var(--border-primary)] px-6 py-4 bg-[var(--bg-secondary)]/30">
+            <div className="flex flex-col sm:flex-row items-center justify-between gap-3">
+              {/* Left side - Back button */}
+              <div className="w-full sm:w-auto">
+                {currentStepIndex > 0 && (
+                  <Button
+                    variant="secondary"
+                    onClick={() => setCurrentStepIndex(currentStepIndex - 1)}
+                    disabled={markStepCompleted.isPending}
+                    className="w-full sm:w-auto"
+                  >
+                    ← {t('onboarding:wizard.navigation.back', 'Atrás')}
+                  </Button>
+                )}
+              </div>
+
+              {/* Right side - Continue button */}
+              <div className="w-full sm:w-auto">
+                <Button
+                  variant="primary"
+                  onClick={handleStepComplete}
+                  disabled={!canContinue || markStepCompleted.isPending}
+                  className="w-full sm:w-auto min-w-[200px]"
+                >
+                  {markStepCompleted.isPending ? (
+                    <span className="flex items-center gap-2">
+                      <div className="w-4 h-4 border-2 border-white border-t-transparent rounded-full animate-spin" />
+                      {t('common:saving', 'Guardando...')}
+                    </span>
+                  ) : currentStepIndex === VISIBLE_STEPS.length - 1 ? (
+                    t('onboarding:wizard.navigation.finish', 'Finalizar →')
+                  ) : (
+                    t('onboarding:wizard.navigation.next', 'Continuar →')
+                  )}
+                </Button>
+              </div>
+            </div>
+          </div>
+        )}
       </Card>
     </div>
   );