diff --git a/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx b/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
index e06b5a5ac8..ba18763d7c 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
@@ -5,8 +5,7 @@ import { Input } from 'antd'
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { SettingDivider } from '..'
-import { AgentLabel, SettingsInline, SettingsTitle } from './shared'
+import { AgentLabel, SettingsContainer, SettingsItem, SettingsTitle } from './shared'
 
 interface AgentEssentialSettingsProps {
   agent: AgentEntity | undefined | null
@@ -26,27 +25,28 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
   if (!agent) return null
 
   return (
-    <div className="flex flex-1 flex-col overflow-hidden">
-      <SettingsInline>
+    <SettingsContainer>
+      <SettingsItem inline>
         <SettingsTitle>{t('agent.type.label')}</SettingsTitle>
         <AgentLabel type={agent.type} />
-      </SettingsInline>
-      <SettingDivider />
-      <SettingsTitle>{t('common.name')}</SettingsTitle>
-      <HStack gap={8} alignItems="center">
-        <Input
-          placeholder={t('common.assistant') + t('common.name')}
-          value={name}
-          onChange={(e) => setName(e.target.value)}
-          onBlur={() => {
-            if (name !== agent.name) {
-              onUpdate()
-            }
-          }}
-          style={{ flex: 1 }}
-        />
-      </HStack>
-    </div>
+      </SettingsItem>
+      <SettingsItem>
+        <SettingsTitle>{t('common.name')}</SettingsTitle>
+        <HStack gap={8} alignItems="center">
+          <Input
+            placeholder={t('common.assistant') + t('common.name')}
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            onBlur={() => {
+              if (name !== agent.name) {
+                onUpdate()
+              }
+            }}
+            style={{ flex: 1 }}
+          />
+        </HStack>
+      </SettingsItem>
+    </SettingsContainer>
   )
 }
 
diff --git a/src/renderer/src/pages/settings/AgentSettings/AgentPromptSettings.tsx b/src/renderer/src/pages/settings/AgentSettings/AgentPromptSettings.tsx
index db58e6ba6c..9cf6478f0d 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AgentPromptSettings.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentPromptSettings.tsx
@@ -12,7 +12,7 @@ import { useTranslation } from 'react-i18next'
 import ReactMarkdown from 'react-markdown'
 import styled from 'styled-components'
 
-import { SettingsTitle } from './shared'
+import { SettingsContainer, SettingsItem, SettingsTitle } from './shared'
 
 interface AgentPromptSettingsProps {
   agent: AgentEntity | undefined | null
@@ -51,70 +51,65 @@ const AgentPromptSettings: FC<AgentPromptSettingsProps> = ({ agent, update }) =>
   if (!agent) return null
 
   return (
-    <Container>
-      <SettingsTitle>
-        {t('common.prompt')}
-        <Popover title={t('agents.add.prompt.variables.tip.title')} content={promptVarsContent}>
-          <HelpCircle size={14} color="var(--color-text-2)" />
-        </Popover>
-      </SettingsTitle>
-      <TextAreaContainer>
-        <RichEditorContainer>
-          {showPreview ? (
-            <MarkdownContainer
-              onDoubleClick={() => {
-                const currentScrollTop = editorRef.current?.getScrollTop?.() || 0
+    <SettingsContainer>
+      <SettingsItem divider={false} className="flex-1">
+        <SettingsTitle>
+          {t('common.prompt')}
+          <Popover title={t('agents.add.prompt.variables.tip.title')} content={promptVarsContent}>
+            <HelpCircle size={14} color="var(--color-text-2)" />
+          </Popover>
+        </SettingsTitle>
+        <TextAreaContainer>
+          <RichEditorContainer>
+            {showPreview ? (
+              <MarkdownContainer
+                onDoubleClick={() => {
+                  const currentScrollTop = editorRef.current?.getScrollTop?.() || 0
+                  setShowPreview(false)
+                  requestAnimationFrame(() => editorRef.current?.setScrollTop?.(currentScrollTop))
+                }}>
+                <ReactMarkdown>{processedPrompt || instructions}</ReactMarkdown>
+              </MarkdownContainer>
+            ) : (
+              <CodeEditor
+                value={instructions}
+                language="markdown"
+                onChange={setInstructions}
+                height="100%"
+                expanded={false}
+                style={{
+                  height: '100%'
+                }}
+              />
+            )}
+          </RichEditorContainer>
+        </TextAreaContainer>
+        <HSpaceBetweenStack width="100%" justifyContent="flex-end" mt="10px">
+          <TokenCount>Tokens: {tokenCount}</TokenCount>
+          <Button
+            type="primary"
+            icon={showPreview ? <Edit size={14} /> : <Save size={14} />}
+            onClick={() => {
+              const currentScrollTop = editorRef.current?.getScrollTop?.() || 0
+              if (showPreview) {
                 setShowPreview(false)
                 requestAnimationFrame(() => editorRef.current?.setScrollTop?.(currentScrollTop))
-              }}>
-              <ReactMarkdown>{processedPrompt || instructions}</ReactMarkdown>
-            </MarkdownContainer>
-          ) : (
-            <CodeEditor
-              value={instructions}
-              language="markdown"
-              onChange={setInstructions}
-              height="100%"
-              expanded={false}
-              style={{
-                height: '100%'
-              }}
-            />
-          )}
-        </RichEditorContainer>
-      </TextAreaContainer>
-      <HSpaceBetweenStack width="100%" justifyContent="flex-end" mt="10px">
-        <TokenCount>Tokens: {tokenCount}</TokenCount>
-        <Button
-          type="primary"
-          icon={showPreview ? <Edit size={14} /> : <Save size={14} />}
-          onClick={() => {
-            const currentScrollTop = editorRef.current?.getScrollTop?.() || 0
-            if (showPreview) {
-              setShowPreview(false)
-              requestAnimationFrame(() => editorRef.current?.setScrollTop?.(currentScrollTop))
-            } else {
-              onUpdate()
-              requestAnimationFrame(() => {
-                setShowPreview(true)
-                requestAnimationFrame(() => editorRef.current?.setScrollTop?.(currentScrollTop))
-              })
-            }
-          }}>
-          {showPreview ? t('common.edit') : t('common.save')}
-        </Button>
-      </HSpaceBetweenStack>
-    </Container>
+              } else {
+                onUpdate()
+                requestAnimationFrame(() => {
+                  setShowPreview(true)
+                  requestAnimationFrame(() => editorRef.current?.setScrollTop?.(currentScrollTop))
+                })
+              }
+            }}>
+            {showPreview ? t('common.edit') : t('common.save')}
+          </Button>
+        </HSpaceBetweenStack>
+      </SettingsItem>
+    </SettingsContainer>
   )
 }
 
-const Container = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  overflow: hidden;
-`
-
 const TextAreaContainer = styled.div`
   position: relative;
   width: 100%;
diff --git a/src/renderer/src/pages/settings/AgentSettings/shared.tsx b/src/renderer/src/pages/settings/AgentSettings/shared.tsx
index 6ca583db65..a570c82036 100644
--- a/src/renderer/src/pages/settings/AgentSettings/shared.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/shared.tsx
@@ -4,14 +4,12 @@ import { getAgentTypeLabel } from '@renderer/i18n/label'
 import { AgentType } from '@renderer/types'
 import React from 'react'
 
+import { SettingDivider } from '..'
+
 export const SettingsTitle: React.FC<React.PropsWithChildren> = ({ children }) => {
   return <div className="mb-1 flex items-center gap-2 font-bold">{children}</div>
 }
 
-export const SettingsInline: React.FC<React.PropsWithChildren> = ({ children }) => {
-  return <div className="flex items-center justify-between gap-2">{children}</div>
-}
-
 export type AgentLabelProps = {
   type: AgentType
   name?: string
@@ -31,3 +29,37 @@ export const AgentLabel: React.FC<AgentLabelProps> = ({ type, name, classNames,
     </div>
   )
 }
+
+export interface SettingsItemProps extends React.ComponentPropsWithRef<'div'> {
+  /** Add a divider beneath the item if true, defaults to true.  */
+  divider?: boolean
+  /** Apply row direction flex or not, defaults to false. */
+  inline?: boolean
+}
+
+export const SettingsItem: React.FC<SettingsItemProps> = ({
+  children,
+  divider = true,
+  inline = false,
+  className,
+  ...props
+}) => {
+  return (
+    <>
+      <div
+        {...props}
+        className={cn('flex flex-col', inline ? 'flex-row items-center justify-between gap-2' : undefined, className)}>
+        {children}
+      </div>
+      {divider && <SettingDivider />}
+    </>
+  )
+}
+
+export const SettingsContainer: React.FC<React.ComponentPropsWithRef<'div'>> = ({ children, className, ...props }) => {
+  return (
+    <div className={cn('flex flex-1 flex-col overflow-hidden', className)} {...props}>
+      {children}
+    </div>
+  )
+}