diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
index 99246182..fede5d7a 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTAvailableModels.kt
@@ -7,8 +7,7 @@ import javax.swing.Icon
 
 object CodeGPTAvailableModels {
 
-    val DEFAULT_CHAT_MODEL =
-        CodeGPTModel("Gemini 2.5 Flash", "gemini-flash-2.5", Icons.Google, ANONYMOUS)
+    val DEFAULT_CHAT_MODEL = CodeGPTModel("GPT-4.1 Mini", "gpt-4.1-mini", Icons.Google, ANONYMOUS)
     val DEFAULT_CODE_MODEL = CodeGPTModel("Codestral", "codestral", Icons.Mistral, ANONYMOUS)
 
     @JvmStatic
@@ -17,6 +16,7 @@ object CodeGPTAvailableModels {
             null, ANONYMOUS -> listOf(
                 CodeGPTModel("o4-mini", "o4-mini", Icons.OpenAI, INDIVIDUAL),
                 CodeGPTModel("Gemini 2.5 Pro", "gemini-pro-2.5", Icons.Google, INDIVIDUAL),
+                CodeGPTModel("Claude Sonnet 4 (thinking)", "claude-4-sonnet-thinking", Icons.Anthropic, INDIVIDUAL),
                 CodeGPTModel("Claude Sonnet 4", "claude-4-sonnet", Icons.Anthropic, INDIVIDUAL),
                 CodeGPTModel("DeepSeek R1", "deepseek-r1", Icons.DeepSeek, INDIVIDUAL),
                 CodeGPTModel("Gemini 2.5 Flash", "gemini-flash-2.5", Icons.Google, ANONYMOUS),
@@ -26,6 +26,7 @@ object CodeGPTAvailableModels {
             FREE -> listOf(
                 CodeGPTModel("o4-mini", "o4-mini", Icons.OpenAI, INDIVIDUAL),
                 CodeGPTModel("Gemini 2.5 Pro", "gemini-pro-2.5", Icons.Google, INDIVIDUAL),
+                CodeGPTModel("Claude Sonnet 4 (thinking)", "claude-4-sonnet-thinking", Icons.Anthropic, INDIVIDUAL),
                 CodeGPTModel("Claude Sonnet 4", "claude-4-sonnet", Icons.Anthropic, INDIVIDUAL),
                 CodeGPTModel("DeepSeek R1", "deepseek-r1", Icons.DeepSeek, INDIVIDUAL),
                 CodeGPTModel("DeepSeek V3", "deepseek-v3", Icons.DeepSeek, FREE),
@@ -38,6 +39,7 @@ object CodeGPTAvailableModels {
             INDIVIDUAL -> listOf(
                 CodeGPTModel("o4-mini", "o4-mini", Icons.OpenAI, INDIVIDUAL),
                 CodeGPTModel("GPT-4.1", "gpt-4.1", Icons.OpenAI, INDIVIDUAL),
+                CodeGPTModel("Claude Sonnet 4 (thinking)", "claude-4-sonnet-thinking", Icons.Anthropic, INDIVIDUAL),
                 CodeGPTModel("Claude Sonnet 4", "claude-4-sonnet", Icons.Anthropic, INDIVIDUAL),
                 CodeGPTModel("Gemini 2.5 Pro", "gemini-pro-2.5", Icons.Google, INDIVIDUAL),
                 CodeGPTModel("DeepSeek R1", "deepseek-r1", Icons.DeepSeek, INDIVIDUAL),
@@ -51,6 +53,7 @@ object CodeGPTAvailableModels {
         CodeGPTModel("o4-mini", "o4-mini", Icons.OpenAI, INDIVIDUAL),
         CodeGPTModel("GPT-4.1", "gpt-4.1", Icons.OpenAI, INDIVIDUAL),
         CodeGPTModel("GPT-4.1 Mini", "gpt-4.1-mini", Icons.OpenAI, ANONYMOUS),
+        CodeGPTModel("Claude Sonnet 4 (thinking)", "claude-4-sonnet-thinking", Icons.Anthropic, INDIVIDUAL),
         CodeGPTModel("Claude Sonnet 4", "claude-4-sonnet", Icons.Anthropic, INDIVIDUAL),
         CodeGPTModel("Gemini 2.5 Pro", "gemini-pro-2.5", Icons.Google, INDIVIDUAL),
         CodeGPTModel("Gemini 2.5 Flash", "gemini-flash-2.5", Icons.Google, ANONYMOUS),
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
index 0f0d2283..ba5ad000 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/UserInputPanel.kt
@@ -278,6 +278,7 @@ class UserInputPanel(
             ServiceType.CUSTOM_OPENAI,
             ServiceType.ANTHROPIC,
             ServiceType.GOOGLE,
+            ServiceType.OPENAI,
             ServiceType.OLLAMA -> true
 
             ServiceType.CODEGPT -> {
@@ -286,7 +287,8 @@ class UserInputPanel(
                     "gpt-4.1-mini",
                     "gemini-pro-2.5",
                     "gemini-flash-2.5",
-                    "claude-4-sonnet"
+                    "claude-4-sonnet",
+                    "claude-4-sonnet-thinking"
                 ).contains(
                     service<CodeGPTServiceSettings>()
                         .state
@@ -295,14 +297,6 @@ class UserInputPanel(
                 )
             }
 
-            ServiceType.OPENAI -> {
-                listOf(
-                    OpenAIChatCompletionModel.GPT_4_VISION_PREVIEW.code,
-                    OpenAIChatCompletionModel.GPT_4_O.code,
-                    OpenAIChatCompletionModel.GPT_4_O_MINI.code
-                ).contains(service<OpenAISettings>().state.model)
-            }
-
             else -> false
         }
     }