diff --git a/web/src/components/message-history-window-size-item.tsx b/web/src/components/message-history-window-size-item.tsx
index dbb18a3f9..bab9f4ccb 100644
--- a/web/src/components/message-history-window-size-item.tsx
+++ b/web/src/components/message-history-window-size-item.tsx
@@ -41,7 +41,9 @@ export function MessageHistoryWindowSizeFormField() {
       name={'message_history_window_size'}
       render={({ field }) => (
         <FormItem>
-          <FormLabel>{t('flow.messageHistoryWindowSize')}</FormLabel>
+          <FormLabel tooltip={t('flow.messageHistoryWindowSizeTip')}>
+            {t('flow.messageHistoryWindowSize')}
+          </FormLabel>
           <FormControl>
             <Input {...field} type={'number'}></Input>
           </FormControl>
diff --git a/web/src/pages/agent/form-sheet/use-form-config-map.tsx b/web/src/pages/agent/form-sheet/use-form-config-map.tsx
index 41db2417a..0cc7b3b61 100644
--- a/web/src/pages/agent/form-sheet/use-form-config-map.tsx
+++ b/web/src/pages/agent/form-sheet/use-form-config-map.tsx
@@ -114,8 +114,14 @@ export function useFormConfigMap() {
     },
     [Operator.RewriteQuestion]: {
       component: RewriteQuestionForm,
-      defaultValues: {},
-      schema: z.object({}),
+      defaultValues: {
+        message_history_window_size: 6,
+      },
+      schema: z.object({
+        llm_id: z.string(),
+        message_history_window_size: z.number(),
+        language: z.string(),
+      }),
     },
     [Operator.Baidu]: {
       component: BaiduForm,
diff --git a/web/src/pages/agent/form/rewrite-question-form/index.tsx b/web/src/pages/agent/form/rewrite-question-form/index.tsx
index c2b2e8db8..b2038a666 100644
--- a/web/src/pages/agent/form/rewrite-question-form/index.tsx
+++ b/web/src/pages/agent/form/rewrite-question-form/index.tsx
@@ -1,39 +1,66 @@
-import LLMSelect from '@/components/llm-select';
-import MessageHistoryWindowSizeItem from '@/components/message-history-window-size-item';
-import { useTranslate } from '@/hooks/common-hooks';
-import { Form, Select } from 'antd';
+import { NextLLMSelect } from '@/components/llm-select';
+import { MessageHistoryWindowSizeFormField } from '@/components/message-history-window-size-item';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@/components/ui/form';
+import { RAGFlowSelect } from '@/components/ui/select';
+import { useTranslation } from 'react-i18next';
 import { GoogleLanguageOptions } from '../../constant';
-import { IOperatorForm } from '../../interface';
+import { INextOperatorForm } from '../../interface';
 
-const RewriteQuestionForm = ({ onValuesChange, form }: IOperatorForm) => {
-  const { t } = useTranslate('chat');
+const RewriteQuestionForm = ({ form }: INextOperatorForm) => {
+  const { t } = useTranslation();
 
   return (
-    <Form
-      name="basic"
-      labelCol={{ span: 8 }}
-      wrapperCol={{ span: 16 }}
-      onValuesChange={onValuesChange}
-      autoComplete="off"
-      form={form}
-    >
-      <Form.Item
-        name={'llm_id'}
-        label={t('model', { keyPrefix: 'chat' })}
-        tooltip={t('modelTip', { keyPrefix: 'chat' })}
+    <Form {...form}>
+      <form
+        className="space-y-6"
+        onSubmit={(e) => {
+          e.preventDefault();
+        }}
       >
-        <LLMSelect></LLMSelect>
-      </Form.Item>
-      <Form.Item
-        label={t('language')}
-        name={'language'}
-        tooltip={t('languageTip')}
-      >
-        <Select options={GoogleLanguageOptions} allowClear={true}></Select>
-      </Form.Item>
-      <MessageHistoryWindowSizeItem
-        initialValue={6}
-      ></MessageHistoryWindowSizeItem>
+        <FormField
+          control={form.control}
+          name="llm_id"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel tooltip={t('chat.modelTip')}>
+                {t('chat.model')}
+              </FormLabel>
+              <FormControl>
+                <NextLLMSelect {...field} />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+        <FormField
+          control={form.control}
+          name="language"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel tooltip={t('chat.languageTip')}>
+                {t('chat.language')}
+              </FormLabel>
+              <FormControl>
+                <RAGFlowSelect
+                  options={GoogleLanguageOptions}
+                  allowClear={true}
+                  {...field}
+                ></RAGFlowSelect>
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <MessageHistoryWindowSizeFormField></MessageHistoryWindowSizeFormField>
+      </form>
     </Form>
   );
 };