diff --git a/.changeset/fix-case-insensitive-model-search.md b/.changeset/fix-case-insensitive-model-search.md
new file mode 100644
index 00000000000..0e42a39f8e9
--- /dev/null
+++ b/.changeset/fix-case-insensitive-model-search.md
@@ -0,0 +1,10 @@
+---
+"webview-ui": patch
+---
+
+Fix case-insensitive model search in ModelPicker
+
+Users can now search for models regardless of casing. For example, searching for "kimi k2.5" will find models like "Kimi-K2.5-Instruct". This fixes model discovery issues when using Azure Cognitive Services or other OpenAI-compatible providers that return models with different casing.
+
+Before: Search was case-sensitive, making it hard to find models
+After: Search is case-insensitive for better discoverability
diff --git a/.changeset/fix-kimi-model-search.md b/.changeset/fix-kimi-model-search.md
new file mode 100644
index 00000000000..60ffea14ba0
--- /dev/null
+++ b/.changeset/fix-kimi-model-search.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fix Kimi model search and add Kimi models as fallback for OpenAI Compatible provider
diff --git a/webview-ui/src/components/settings/ModelPicker.tsx b/webview-ui/src/components/settings/ModelPicker.tsx
index 5f9d82ceacf..e2fecfa1515 100644
--- a/webview-ui/src/components/settings/ModelPicker.tsx
+++ b/webview-ui/src/components/settings/ModelPicker.tsx
@@ -98,6 +98,21 @@ export const ModelPicker = ({
 
 	const [searchValue, setSearchValue] = useState("")
 
+	// kilocode_change: Case-insensitive search with dash/space normalization
+	const normalizeForSearch = (str: string) => str.toLowerCase().replace(/[-_\s]/g, "")
+
+	const filteredPreferredIds = useMemo(() => {
+		if (!searchValue.trim()) return preferredModelIds
+		const searchNormalized = normalizeForSearch(searchValue)
+		return preferredModelIds.filter((id) => normalizeForSearch(id).includes(searchNormalized))
+	}, [preferredModelIds, searchValue])
+
+	const filteredRestIds = useMemo(() => {
+		if (!searchValue.trim()) return restModelIds
+		const searchNormalized = normalizeForSearch(searchValue)
+		return restModelIds.filter((id) => normalizeForSearch(id).includes(searchNormalized))
+	}, [restModelIds, searchValue])
+
 	const onSelect = useCallback(
 		(modelId: string) => {
 			if (!modelId) {
@@ -179,7 +194,7 @@ export const ModelPicker = ({
 						</Button>
 					</PopoverTrigger>
 					<PopoverContent className="p-0 w-[var(--radix-popover-trigger-width)]">
-						<Command>
+						<Command shouldFilter={false}>
 							<div className="relative">
 								<CommandInput
 									ref={searchInputRef}
@@ -206,10 +221,15 @@ export const ModelPicker = ({
 										</div>
 									)}
 								</CommandEmpty>
-								{/* kilocode_change start: Section headers for recommended and all models */}
-								{preferredModelIds.length > 0 && (
-									<CommandGroup heading={t("settings:modelPicker.recommendedModels")}>
-										{preferredModelIds.map((model) => (
+								{/* kilocode_change start: Section headers for recommended and all models with case-insensitive search */}
+								{filteredPreferredIds.length > 0 && (
+									<CommandGroup
+										heading={
+											searchValue.trim()
+												? t("settings:modelPicker.matchingModels")
+												: t("settings:modelPicker.recommendedModels")
+										}>
+										{filteredPreferredIds.map((model) => (
 											<CommandItem
 												key={model}
 												value={model}
@@ -229,9 +249,9 @@ export const ModelPicker = ({
 										))}
 									</CommandGroup>
 								)}
-								{restModelIds.length > 0 && (
+								{filteredRestIds.length > 0 && (
 									<CommandGroup heading={t("settings:modelPicker.allModels")}>
-										{restModelIds.map((model) => (
+										{filteredRestIds.map((model) => (
 											<CommandItem
 												key={model}
 												value={model}
diff --git a/webview-ui/src/components/settings/providers/OpenAICompatible.tsx b/webview-ui/src/components/settings/providers/OpenAICompatible.tsx
index 4eea6f09f1b..c7130e18c08 100644
--- a/webview-ui/src/components/settings/providers/OpenAICompatible.tsx
+++ b/webview-ui/src/components/settings/providers/OpenAICompatible.tsx
@@ -1,4 +1,4 @@
-import { useState, useCallback, useEffect } from "react"
+import { useState, useCallback, useEffect, useMemo } from "react"
 import { useEvent } from "react-use"
 import { Checkbox } from "vscrui"
 import { VSCodeButton, VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
@@ -11,6 +11,8 @@ import {
 	type ExtensionMessage,
 	azureOpenAiDefaultApiVersion,
 	openAiModelInfoSaneDefaults,
+	moonshotModels,
+	moonshotDefaultModelId,
 } from "@roo-code/types"
 
 import { useAppTranslation } from "@src/i18n/TranslationContext"
@@ -48,6 +50,22 @@ export const OpenAICompatible = ({
 		return Object.entries(headers)
 	})
 
+	const isKimiEndpoint =
+		apiConfiguration.openAiBaseUrl?.toLowerCase().includes("kimi") ||
+		apiConfiguration.openAiBaseUrl?.toLowerCase().includes("moonshot") ||
+		apiConfiguration.openAiBaseUrl?.toLowerCase().includes("api.moonshot.ai") ||
+		apiConfiguration.openAiBaseUrl?.toLowerCase().includes("api.moonshot.cn")
+
+	const modelsToUse = useMemo(() => {
+		const fetchedModels = openAiModels ?? {}
+		if (isKimiEndpoint) {
+			return { ...moonshotModels, ...fetchedModels }
+		}
+		return fetchedModels
+	}, [isKimiEndpoint, openAiModels])
+
+	const defaultModelId = isKimiEndpoint ? moonshotDefaultModelId : "gpt-4o"
+
 	const handleAddCustomHeader = useCallback(() => {
 		// Only update the local state to show the new row in the UI.
 		setCustomHeaders((prev) => [...prev, ["", ""]])
@@ -138,10 +156,11 @@ export const OpenAICompatible = ({
 				<label className="block font-medium mb-1">{t("settings:providers.apiKey")}</label>
 			</VSCodeTextField>
 			<ModelPicker
+				key={`${apiConfiguration.openAiBaseUrl}-${isKimiEndpoint}`}
 				apiConfiguration={apiConfiguration}
 				setApiConfigurationField={setApiConfigurationField}
-				defaultModelId="gpt-4o"
-				models={openAiModels}
+				defaultModelId={defaultModelId}
+				models={modelsToUse}
 				modelIdKey="openAiModelId"
 				serviceName="OpenAI"
 				serviceUrl="https://platform.openai.com"