From 5d4c245e127fcf82da99dbf74f08b65642e7729c Mon Sep 17 00:00:00 2001
From: Aleksander Grygier <aleksander.grygier@gmail.com>
Date: Wed, 16 Sep 2026 19:40:40 +0200
Subject: [PATCH] ui : keep the model selector mounted while options swap
 backends

Assisted-by: pi:llama.cpp/DeepSeek-V4.1-Flash
---
 .../app/models/ModelsSelector/ModelsSelectorDropdown.svelte   | 4 ++--
 .../app/models/ModelsSelector/ModelsSelectorSheet.svelte      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorDropdown.svelte b/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorDropdown.svelte
index ba8f2d508f..0961b609d5 100644
--- a/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorDropdown.svelte
+++ b/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorDropdown.svelte
@@ -178,13 +178,13 @@
 </script>
 
 <div class={['relative inline-flex flex-col items-end gap-1', className]}>
-	{#if ms.loading && ms.options.length === 0 && ms.isMultiModel}
+	{#if ms.loading && ms.options.length === 0 && ms.isMultiModel && !ms.switchingBackends}
 		<div class="flex items-center gap-2 text-xs text-muted-foreground">
 			<Loader2 class="h-3.5 w-3.5 animate-spin" />
 
 			Loading models…
 		</div>
-	{:else if ms.options.length === 0 && ms.isMultiModel}
+	{:else if ms.options.length === 0 && ms.isMultiModel && !ms.switchingBackends}
 		{#if currentModel}
 			<span
 				class={[
diff --git a/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorSheet.svelte b/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorSheet.svelte
index d9e8259cc4..c740d9e436 100644
--- a/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorSheet.svelte
+++ b/tools/ui/src/lib/components/app/models/ModelsSelector/ModelsSelectorSheet.svelte
@@ -70,12 +70,12 @@
 </script>
 
 <div class={['relative inline-flex flex-col items-end gap-1', className]}>
-	{#if ms.loading && ms.options.length === 0 && ms.isMultiModel}
+	{#if ms.loading && ms.options.length === 0 && ms.isMultiModel && !ms.switchingBackends}
 		<div class="flex items-center gap-2 text-xs text-muted-foreground">
 			<Loader2 class="h-3.5 w-3.5 animate-spin" />
 			Loading models…
 		</div>
-	{:else if ms.options.length === 0 && ms.isMultiModel}
+	{:else if ms.options.length === 0 && ms.isMultiModel && !ms.switchingBackends}
 		<p class="text-xs text-muted-foreground">No models available.</p>
 	{:else}
 		{@const selectedOption = ms.getDisplayOption()}