diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 0f5edf6..1100eec 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -20,6 +20,12 @@ struct ApiConfig {
     active_character_id: Option<String>,
     #[serde(default)]
     stream: bool,
+    #[serde(default = "default_context_limit")]
+    context_limit: u32,
+}
+
+fn default_context_limit() -> u32 {
+    200000
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -1161,7 +1167,7 @@ async fn validate_api(base_url: String, api_key: String) -> Result<Vec<String>,
 }
 
 #[tauri::command]
-async fn save_api_config(base_url: String, api_key: String, model: String, stream: bool) -> Result<(), String> {
+async fn save_api_config(base_url: String, api_key: String, model: String, stream: bool, context_limit: u32) -> Result<(), String> {
     // Preserve existing active_character_id if it exists
     let active_character_id = load_config().and_then(|c| c.active_character_id);
 
@@ -1171,6 +1177,7 @@ async fn save_api_config(base_url: String, api_key: String, model: String, strea
         model,
         active_character_id,
         stream,
+        context_limit,
     };
     save_config(&config)
 }
diff --git a/src/index.html b/src/index.html
index b04c1c7..742613e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -350,6 +350,19 @@
               </select>
             </div>
 
+            <div class="form-group">
+              <label for="context-limit">Context Limit (tokens)</label>
+              <input
+                type="number"
+                id="context-limit"
+                placeholder="200000"
+                value="200000"
+                min="1000"
+                step="1000"
+              />
+              <small style="color: var(--text-secondary); margin-top: 4px; display: block;">Maximum tokens for model context (e.g., 200000 for Claude)</small>
+            </div>
+
             <div class="form-group">
               <label>
                 <input type="checkbox" id="stream-toggle" />
diff --git a/src/main.js b/src/main.js
index 93d554c..04f0659 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1457,6 +1457,7 @@ async function handleSaveSettings(e) {
   const apiKey = document.getElementById('api-key').value.trim();
   const model = document.getElementById('model-select').value;
   const stream = document.getElementById('stream-toggle').checked;
+  const contextLimit = parseInt(document.getElementById('context-limit').value) || 200000;
   const saveBtn = document.getElementById('save-settings-btn');
   const validationMsg = document.getElementById('validation-message');
 
@@ -1472,7 +1473,7 @@ async function handleSaveSettings(e) {
   setStatus('Saving configuration...', 'default');
 
   try {
-    await invoke('save_api_config', { baseUrl, apiKey, model, stream });
+    await invoke('save_api_config', { baseUrl, apiKey, model, stream, contextLimit });
     validationMsg.textContent = 'Configuration saved successfully';
     validationMsg.className = 'validation-message success';
     setStatus('Configuration saved', 'success');
@@ -1661,10 +1662,18 @@ async function updateTokenCount() {
         currentInput
       });
 
+      // Get context limit from config
+      let contextLimit = 200000; // Default
+      try {
+        const config = await invoke('get_api_config');
+        contextLimit = config.context_limit || 200000;
+      } catch (e) {
+        // Use default if config not available
+      }
+
       // Update total display
       const tokenCounter = document.getElementById('token-counter');
       const tokenCountTotal = document.getElementById('token-count-total');
-      const contextLimit = 200000; // Claude 200k context
 
       // Format: "2.5k / 200k tokens"
       tokenCountTotal.textContent = `${formatTokenCount(tokenData.total)} / ${formatTokenCount(contextLimit)} tokens`;
@@ -3339,6 +3348,7 @@ async function loadExistingConfig() {
     document.getElementById('api-base-url').value = config.base_url;
     document.getElementById('api-key').value = config.api_key;
     document.getElementById('stream-toggle').checked = config.stream || false;
+    document.getElementById('context-limit').value = config.context_limit || 200000;
 
     const modelSelect = document.getElementById('model-select');
     modelSelect.innerHTML = ''; // Clear existing options