diff --git a/src/renderer/src/components/Popups/TextEditPopup.tsx b/src/renderer/src/components/Popups/TextEditPopup.tsx
index bb83d956..2e20e3c5 100644
--- a/src/renderer/src/components/Popups/TextEditPopup.tsx
+++ b/src/renderer/src/components/Popups/TextEditPopup.tsx
@@ -65,7 +65,7 @@ const PopupContainer: React.FC<Props> = ({ text, textareaProps, modalProps, reso
       centered>
       <TextArea
         ref={textareaRef}
-        rows={4}
+        rows={2}
         autoFocus
         {...textareaProps}
         value={textValue}
diff --git a/src/renderer/src/services/tokens.ts b/src/renderer/src/services/tokens.ts
index 8d5ace9a..d5e0d4c1 100644
--- a/src/renderer/src/services/tokens.ts
+++ b/src/renderer/src/services/tokens.ts
@@ -19,11 +19,6 @@ async function getFileContent(file: FileType) {
 
   const fileId = file.id + file.ext
 
-  if (file.type === FileTypes.IMAGE) {
-    const data = await window.api.file.base64Image(fileId)
-    return data.data
-  }
-
   if (file.type === FileTypes.TEXT) {
     return await window.api.file.read(fileId)
   }
@@ -60,18 +55,31 @@ export function estimateTextTokens(text: string) {
   return usedTokens - 7
 }
 
+export function estimateImageTokens(file: FileType) {
+  return Math.floor(file.size / 100)
+}
+
 export async function estimateMessageUsage(message: Message): Promise<CompletionUsage> {
   const { usedTokens, promptUsedTokens, completionUsedTokens } = new GPTTokens({
     model: 'gpt-4o',
     messages: await getMessageParam(message)
   })
 
-  const hasImage = message.files?.some((f) => f.type === FileTypes.IMAGE)
+  let imageTokens = 0
+
+  if (message.files) {
+    const images = message.files.filter((f) => f.type === FileTypes.IMAGE)
+    if (images.length > 0) {
+      for (const image of images) {
+        imageTokens = estimateImageTokens(image) + imageTokens
+      }
+    }
+  }
 
   return {
     prompt_tokens: promptUsedTokens,
     completion_tokens: completionUsedTokens,
-    total_tokens: hasImage ? Math.floor(usedTokens / 80) : usedTokens - 7
+    total_tokens: usedTokens + imageTokens - 7
   }
 }