diff --git a/app/components/settings.tsx b/app/components/settings.tsx
index 68ebcf084..a43bedebd 100644
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -1699,6 +1699,23 @@ export function Settings() {
               }
             ></input>
           </ListItem>
+          <ListItem
+            title={Locale.Settings.AutoScroll.Title}
+            subTitle={Locale.Settings.AutoScroll.SubTitle}
+          >
+            <input
+              aria-label={Locale.Settings.AutoScroll.Title}
+              type="checkbox"
+              checked={config.enableAutoScroll}
+              data-testid="enable-auto-scroll-checkbox"
+              onChange={(e) =>
+                updateConfig(
+                  (config) =>
+                    (config.enableAutoScroll = e.currentTarget.checked),
+                )
+              }
+            ></input>
+          </ListItem>
         </List>
 
         <SyncItems />
diff --git a/app/store/config.ts b/app/store/config.ts
index 45e21b026..061fed971 100644
--- a/app/store/config.ts
+++ b/app/store/config.ts
@@ -55,6 +55,8 @@ export const DEFAULT_CONFIG = {
 
   enableCodeFold: true, // code fold config
 
+  enableAutoScroll: true, // auto scroll config
+
   disablePromptHint: false,
 
   dontShowMaskSplashScreen: false, // dont show splash screen when create chat