diff --git a/plugins/_model_config/webui/model-field.html b/plugins/_model_config/webui/model-field.html
index 92802edc0..7a9ad3ae7 100644
--- a/plugins/_model_config/webui/model-field.html
+++ b/plugins/_model_config/webui/model-field.html
@@ -141,6 +141,19 @@
       </div>
     </template>
 
+    <!-- Context window size (main and utility only) -->
+    <template x-if="modelType !== 'embedding'">
+      <div class="field">
+        <div class="field-label">
+          <div class="field-title">Context window size</div>
+          <div class="field-description">Maximum number of tokens in the context window. System prompt, chat history, RAG and response all count towards this limit.</div>
+        </div>
+        <div class="field-control">
+          <input type="number" x-model.number="model.ctx_length" />
+        </div>
+      </div>
+    </template>
+
     <!-- Advanced Settings (collapsed by default) -->
     <div class="advanced-section" x-data="{ advOpen: false }">
       <div class="advanced-toggle" @click="advOpen = !advOpen">
@@ -162,19 +175,6 @@
           </div>
         </div>
 
-        <!-- Context length (not for embedding) -->
-        <template x-if="modelType !== 'embedding'">
-          <div class="field">
-            <div class="field-label">
-              <div class="field-title">Context length</div>
-              <div class="field-description">Maximum number of tokens in the context window. System prompt, chat history, RAG and response all count towards this limit.</div>
-            </div>
-            <div class="field-control">
-              <input type="number" x-model.number="model.ctx_length" />
-            </div>
-          </div>
-        </template>
-
         <!-- Chat-specific: ctx_history, max_embeds -->
         <template x-if="modelType === 'chat'">
           <div>
diff --git a/tests/test_model_config_api_keys.py b/tests/test_model_config_api_keys.py
index 1b592c555..acd565a45 100644
--- a/tests/test_model_config_api_keys.py
+++ b/tests/test_model_config_api_keys.py
@@ -222,16 +222,19 @@ def test_model_config_provider_switch_resets_custom_api_base():
     assert '@change="model.api_base = \'\'"' in provider_select
 
 
-def test_model_config_vision_toggle_is_outside_advanced_settings():
+def test_model_config_primary_context_controls_are_outside_advanced_settings():
     model_field_path = PROJECT_ROOT / "plugins" / "_model_config" / "webui" / "model-field.html"
     content = model_field_path.read_text(encoding="utf-8")
 
     vision_start = content.index('<div class="field-title">Supports Vision</div>')
+    context_size_start = content.index('<div class="field-title">Context window size</div>')
     advanced_start = content.index("<!-- Advanced Settings (collapsed by default) -->")
     max_embeds_start = content.index('<div class="field-title">Max embeds</div>')
 
     assert content.count('<div class="field-title">Supports Vision</div>') == 1
+    assert content.count('<div class="field-title">Context window size</div>') == 1
     assert vision_start < advanced_start
+    assert context_size_start < advanced_start
     assert advanced_start < max_embeds_start