diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index f7fe80a08..70f6b4dfb 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -54,6 +54,7 @@ const ModelSelector = ({ model, setModel, provider, setProvider, modelList, prov
         </option>
       </select>
       <select
+        key={provider}
         value={model}
         onChange={(e) => setModel(e.target.value)}
         className="flex-1 p-2 rounded-lg border border-bolt-elements-borderColor bg-bolt-elements-prompt-background text-bolt-elements-textPrimary focus:outline-none focus:ring-2 focus:ring-bolt-elements-focus transition-all"
diff --git a/app/lib/.server/llm/stream-text.ts b/app/lib/.server/llm/stream-text.ts
index 8bfd79786..54a6107f6 100644
--- a/app/lib/.server/llm/stream-text.ts
+++ b/app/lib/.server/llm/stream-text.ts
@@ -43,8 +43,8 @@ function extractPropertiesFromMessage(message: Message): { model: string; provid
 }
 
 export function streamText(
-  messages: Messages, 
-  env: Env, 
+  messages: Messages,
+  env: Env,
   options?: StreamingOptions,
   apiKeys?: Record<string, string>
 ) {
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
index 8ac4151d5..be9bebb0c 100644
--- a/app/utils/constants.ts
+++ b/app/utils/constants.ts
@@ -105,7 +105,34 @@ async function getOpenAILikeModels(): Promise<ModelInfo[]> {
   } catch (e) {
     return []
   }
+}
+
+type OpenRouterModelsResponse = {
+  data: {
+    name: string;
+    id: string;
+    context_length: number;
+    pricing: {
+      prompt: number;
+      completion: number;
+    }
+  }[]
+};
 
+async function getOpenRouterModels(): Promise<ModelInfo[]> {
+  const data: OpenRouterModelsResponse = await (await fetch('https://openrouter.ai/api/v1/models', {
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })).json();
+
+  return data.data.sort((a, b) => a.name.localeCompare(b.name)).map(m => ({
+    name: m.id,
+    label: `${m.name} - in:$${(m.pricing.prompt * 1_000_000).toFixed(
+      2)} out:$${(m.pricing.completion * 1_000_000).toFixed(2)} - context ${Math.floor(
+      m.context_length / 1000)}k`,
+    provider: 'OpenRouter'
+  }));
 }
 
 async function getLMStudioModels(): Promise<ModelInfo[]> {
@@ -124,11 +151,26 @@ async function getLMStudioModels(): Promise<ModelInfo[]> {
 }
 
 
+
 async function initializeModelList(): Promise<void> {
-  const ollamaModels = await getOllamaModels();
-  const openAiLikeModels = await getOpenAILikeModels();
-  const lmstudioModels = await getLMStudioModels();
-  MODEL_LIST = [...ollamaModels,...openAiLikeModels, ...staticModels,...lmstudioModels,];
+   const [
+    ollamaModels,
+    openAiLikeModels,
+    openRouterModels,
+     lmstudioModels
+   ] = await Promise.all([
+    getOllamaModels(),
+    getOpenAILikeModels(),
+    getOpenRouterModels(),
+     getLMStudioModels(),
+  ]);
+  MODEL_LIST = [
+    ...ollamaModels,
+    ...openAiLikeModels,
+    ...staticModels,
+    ...openRouterModels,
+    ...lmstudioModels
+  ];
 }
 initializeModelList().then();
-export { getOllamaModels,getOpenAILikeModels,getLMStudioModels,initializeModelList };
\ No newline at end of file
+export { getOllamaModels,getOpenAILikeModels,getLMStudioModels,initializeModelList, getOpenRouterModels };