diff --git a/chatdesk-ui/app/[locale]/setup/page.tsx b/chatdesk-ui/app/[locale]/setup/page.tsx
index 4cd2b6b..6a496cb 100644
--- a/chatdesk-ui/app/[locale]/setup/page.tsx
+++ b/chatdesk-ui/app/[locale]/setup/page.tsx
@@ -369,7 +369,8 @@ export default function SetupPage() {
             stepTitle={t("setup.SetupComplete")}
             onShouldProceed={handleShouldProceed}
             //showNextButton={true}
-            showNextButton={!isSubmitting}  // 禁用按钮
+            showNextButton={true}        // 一直显示按钮
+            isSubmitting={isSubmitting}  // 控制是否禁用
             showBackButton={true}
           >
             <FinishStep displayName={displayName} />
diff --git a/chatdesk-ui/components/setup/step-container.tsx b/chatdesk-ui/components/setup/step-container.tsx
index 3cdae77..6f2c5ae 100644
--- a/chatdesk-ui/components/setup/step-container.tsx
+++ b/chatdesk-ui/components/setup/step-container.tsx
@@ -21,6 +21,7 @@ interface StepContainerProps {
   children?: React.ReactNode
   showBackButton?: boolean
   showNextButton?: boolean
+  isSubmitting?: boolean // ✅ 新增这个
 }
 
 export const StepContainer: FC<StepContainerProps> = ({
@@ -80,7 +81,7 @@ export const StepContainer: FC<StepContainerProps> = ({
               ref={buttonRef}
               size="sm"
               onClick={() => onShouldProceed(true)}
-              disabled={!showNextButton}
+              disabled={isSubmitting}
             >
               {t("setup.next")}
             </Button>