diff --git a/web/src/pages/flow/constant.tsx b/web/src/pages/flow/constant.tsx
index a3b0cdc68ff..a44511ca590 100644
--- a/web/src/pages/flow/constant.tsx
+++ b/web/src/pages/flow/constant.tsx
@@ -426,6 +426,7 @@ export const initialGenerateValues = {
 
 export const initialRewriteQuestionValues = {
   ...initialLlmBaseValues,
+  message_history_window_size: 6,
 };
 
 export const initialRelevantValues = {
@@ -445,7 +446,7 @@ export const initialMessageValues = {
 
 export const initialKeywordExtractValues = {
   ...initialLlmBaseValues,
-  top_n: 1,
+  top_n: 3,
   ...initialQueryBaseValues,
 };
 export const initialDuckValues = {
diff --git a/web/src/pages/flow/form/keyword-extract-form/index.tsx b/web/src/pages/flow/form/keyword-extract-form/index.tsx
index c4c448c7a22..089df5eab9d 100644
--- a/web/src/pages/flow/form/keyword-extract-form/index.tsx
+++ b/web/src/pages/flow/form/keyword-extract-form/index.tsx
@@ -24,7 +24,7 @@ const KeywordExtractForm = ({ onValuesChange, form, node }: IOperatorForm) => {
       >
         <LLMSelect></LLMSelect>
       </Form.Item>
-      <TopNItem initialValue={1}></TopNItem>
+      <TopNItem initialValue={3}></TopNItem>
     </Form>
   );
 };
diff --git a/web/src/pages/flow/form/rewrite-question-form/index.tsx b/web/src/pages/flow/form/rewrite-question-form/index.tsx
index a0a5a88344b..7d2e2926ea5 100644
--- a/web/src/pages/flow/form/rewrite-question-form/index.tsx
+++ b/web/src/pages/flow/form/rewrite-question-form/index.tsx
@@ -1,4 +1,5 @@
 import LLMSelect from '@/components/llm-select';
+import MessageHistoryWindowSizeItem from '@/components/message-history-window-size-item';
 import { useTranslate } from '@/hooks/common-hooks';
 import { Form } from 'antd';
 import { IOperatorForm } from '../../interface';
@@ -9,8 +10,8 @@ const RewriteQuestionForm = ({ onValuesChange, form }: IOperatorForm) => {
   return (
     <Form
       name="basic"
-      labelCol={{ span: 4 }}
-      wrapperCol={{ span: 20 }}
+      labelCol={{ span: 8 }}
+      wrapperCol={{ span: 16 }}
       onValuesChange={onValuesChange}
       autoComplete="off"
       form={form}
@@ -22,6 +23,9 @@ const RewriteQuestionForm = ({ onValuesChange, form }: IOperatorForm) => {
       >
         <LLMSelect></LLMSelect>
       </Form.Item>
+      <MessageHistoryWindowSizeItem
+        initialValue={6}
+      ></MessageHistoryWindowSizeItem>
     </Form>
   );
 };