diff --git a/apps/desktop/src/renderer/settings/settings-surface.tsx b/apps/desktop/src/renderer/settings/settings-surface.tsx
index 6ac34ebe35..a9f3dd92f5 100644
--- a/apps/desktop/src/renderer/settings/settings-surface.tsx
+++ b/apps/desktop/src/renderer/settings/settings-surface.tsx
@@ -891,7 +891,7 @@ export function SettingsSurface(props: {
                         <p className="settingsPageHeaderDescription">{headerCopy.description}</p>
                       )}
                     </div>
-                    {showsRuntimeHost && runtimeHostOptions.length > 0 ? (
+                    {showsRuntimeHost && runtimeHostOptions.length > 1 ? (
                       <div className="settingsRuntimeHostSelector">
                         <Selector
                           label={copy.runtimeHost}
diff --git a/apps/desktop/stories/settings/settings-pages.stories.tsx b/apps/desktop/stories/settings/settings-pages.stories.tsx
index 6fed9d5b6f..ae7910e74b 100644
--- a/apps/desktop/stories/settings/settings-pages.stories.tsx
+++ b/apps/desktop/stories/settings/settings-pages.stories.tsx
@@ -2205,7 +2205,7 @@ export const ModelsConnectionsHostGenerationRevalidation: Story = {
       isDefault: true,
     });
 
-    await userEvent.click(canvas.getByRole('combobox', { name: 'Runtime Host' }));
+    await userEvent.click(await canvas.findByRole('combobox', { name: 'Runtime Host' }));
     await within(document.body).findByRole('option', { name: 'Remote' });
     await userEvent.keyboard('{Escape}');
     await expect(boundary).toHaveAttribute('inert');