diff --git a/src/apps/chat/components/appbar/Dropdowns.tsx b/src/apps/chat/components/appbar/Dropdowns.tsx
index cd510bcb9..d9d98f314 100644
--- a/src/apps/chat/components/appbar/Dropdowns.tsx
+++ b/src/apps/chat/components/appbar/Dropdowns.tsx
@@ -44,6 +44,8 @@ export function Dropdowns(props: {
   const handleSystemPurposeChange = (event: any, value: SystemPurposeId | null) =>
     value && props.conversationId && setSystemPurposeId(props.conversationId, value);
 
+  const handleOpenLLMOptions = () => chatLLMId && openLLMOptions(chatLLMId);
+
   // filter-out hidden models
   const llmItems: DropdownItems = {};
   for (const llm of llms)
@@ -58,7 +60,8 @@ export function Dropdowns(props: {
       placeholder='Model'
       appendOption={<>
 
-        <Option onClick={() => openLLMOptions('openai-gpt-4') /* FIXME */}>
+      {chatLLMId && (
+        <Option disabled={!chatLLMId} onClick={handleOpenLLMOptions}>
           <ListItemDecorator>
             <SettingsIcon color='info' />
           </ListItemDecorator>
@@ -66,6 +69,7 @@ export function Dropdowns(props: {
             Options
           </Typography>
         </Option>
+      )}
 
         <Option onClick={openModelsSetup}>
           <ListItemDecorator>
diff --git a/src/modules/llms/configurator/LLMOptions.tsx b/src/modules/llms/configurator/LLMOptions.tsx
index 69a2334fe..7709fd514 100644
--- a/src/modules/llms/configurator/LLMOptions.tsx
+++ b/src/modules/llms/configurator/LLMOptions.tsx
@@ -38,7 +38,7 @@ export function LLMOptions(props: { id: DLLMId }) {
   return (
 
     <GoodModal
-      title={`${llm.label} Options`}
+      title={<><b>{llm.label}</b> options</>}
       open={!!props.id} onClose={closeLLMOptions}
       startButton={
         <Button variant='plain' color='neutral' onClick={handleLlmDelete} startDecorator={<DeleteOutlineIcon />}>