diff --git a/src/renderer/src/components/Popups/AgentSettingPopup.tsx b/src/renderer/src/components/Popups/AgentSettingPopup.tsx
index 1dfb5d3a..5b217165 100644
--- a/src/renderer/src/components/Popups/AgentSettingPopup.tsx
+++ b/src/renderer/src/components/Popups/AgentSettingPopup.tsx
@@ -16,6 +16,7 @@ interface Props extends AgentSettingPopupShowParams {
 const AgentSettingPopupContainer: React.FC<Props> = ({ agent, resolve }) => {
   const [name, setName] = useState(agent.name)
   const [description, setDescription] = useState(agent.description)
+  const [prompt, setPrompt] = useState(agent.prompt)
   const [open, setOpen] = useState(true)
 
   const onOk = () => {
@@ -27,12 +28,12 @@ const AgentSettingPopupContainer: React.FC<Props> = ({ agent, resolve }) => {
   }
 
   const onClose = () => {
-    resolve({ ...agent, name, description })
+    resolve({ ...agent, name, description, prompt })
   }
 
   return (
     <Modal title={agent.name} open={open} onOk={onOk} onCancel={handleCancel} afterClose={onClose}>
-      <Box mb={8}>Agent name</Box>
+      <Box mb={8}>Name</Box>
       <Input placeholder="Agent Name" value={name} onChange={(e) => setName(e.target.value)} autoFocus />
       <Box mt={8} mb={8}>
         Description
@@ -44,6 +45,16 @@ const AgentSettingPopupContainer: React.FC<Props> = ({ agent, resolve }) => {
         onChange={(e) => setDescription(e.target.value)}
         autoFocus
       />
+      <Box mt={8} mb={8}>
+        Prompt
+      </Box>
+      <TextArea
+        rows={4}
+        placeholder="Agent Prompt"
+        value={prompt}
+        onChange={(e) => setPrompt(e.target.value)}
+        autoFocus
+      />
     </Modal>
   )
 }
diff --git a/src/renderer/src/services/agent.ts b/src/renderer/src/services/agent.ts
index c0ebc0dc..42ee0cc3 100644
--- a/src/renderer/src/services/agent.ts
+++ b/src/renderer/src/services/agent.ts
@@ -7,6 +7,7 @@ export function getDefaultAgent(): Agent {
     id: 'default',
     name: 'Default Agent',
     description: "Hello, I'm Default Agent.",
+    prompt: '',
     topics: [
       {
         id: uuid(),
diff --git a/src/renderer/src/services/api.ts b/src/renderer/src/services/api.ts
index f56f1862..479ae495 100644
--- a/src/renderer/src/services/api.ts
+++ b/src/renderer/src/services/api.ts
@@ -14,7 +14,10 @@ interface FetchChatCompletionParams {
 export async function fetchChatCompletion({ message, agent, topic, onResponse }: FetchChatCompletionParams) {
   const stream = await openaiProvider.chat.completions.create({
     model: 'Qwen/Qwen2-7B-Instruct',
-    messages: [{ role: 'user', content: message.content }],
+    messages: [
+      { role: 'system', content: agent.prompt },
+      { role: 'user', content: message.content }
+    ],
     stream: true
   })
 
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index d362cd79..05066333 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -2,6 +2,7 @@ export type Agent = {
   id: string
   name: string
   description: string
+  prompt: string
   topics: Topic[]
 }