diff --git a/public/index.html b/public/index.html
index f1575c994..f2e9dec84 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2405,6 +2405,10 @@
                                         <option value="gpt-4-32k-0613">gpt-4-32k-0613 (2023)</option>
                                         <option value="gpt-4-32k-0314">gpt-4-32k-0314 (2023)</option>
                                     </optgroup>
+                                    <optgroup label="GPT-4o">
+                                        <option value="gpt-4o">gpt-4o</option>
+                                        <option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>
+                                    </optgroup>
                                     <optgroup label="GPT-4 Turbo">
                                         <option value="gpt-4-turbo">gpt-4-turbo</option>
                                         <option value="gpt-4-turbo-2024-04-09">gpt-4-turbo-2024-04-09</option>
diff --git a/public/scripts/extensions/caption/index.js b/public/scripts/extensions/caption/index.js
index 98ac565a2..f0738e5d5 100644
--- a/public/scripts/extensions/caption/index.js
+++ b/public/scripts/extensions/caption/index.js
@@ -435,6 +435,7 @@ jQuery(function () {
                             <select id="caption_multimodal_model" class="flex1 text_pole">
                                 <option data-type="openai" value="gpt-4-vision-preview">gpt-4-vision-preview</option>
                                 <option data-type="openai" value="gpt-4-turbo">gpt-4-turbo</option>
+                                <option data-type="openai" value="gpt-4o">gpt-4o</option>
                                 <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
                                 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
                                 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index a148616a8..6ca5de762 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -3515,7 +3515,7 @@ function getMaxContextOpenAI(value) {
     if (oai_settings.max_context_unlocked) {
         return unlocked_max;
     }
-    else if (value.includes('gpt-4-turbo') || value.includes('gpt-4-1106') || value.includes('gpt-4-0125') || value.includes('gpt-4-vision')) {
+    else if (value.includes('gpt-4-turbo') || value.includes('gpt-4o') || value.includes('gpt-4-1106') || value.includes('gpt-4-0125') || value.includes('gpt-4-vision')) {
         return max_128k;
     }
     else if (value.includes('gpt-3.5-turbo-1106')) {
@@ -4244,6 +4244,7 @@ export function isImageInliningSupported() {
         'gemini-pro-vision',
         'claude-3',
         'gpt-4-turbo',
+        'gpt-4o',
     ];
 
     switch (oai_settings.chat_completion_source) {