From 52cc5d665e7757bf4090183349fd9fa3fe02de8e Mon Sep 17 00:00:00 2001
From: Mark IJbema <mark@kilocode.ai>
Date: Tue, 10 Mar 2026 10:42:29 +0100
Subject: [PATCH] fix: return to settings view after migration wizard when
 opened from settings

---
 packages/kilo-vscode/webview-ui/src/App.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/kilo-vscode/webview-ui/src/App.tsx b/packages/kilo-vscode/webview-ui/src/App.tsx
index 1e7de4cac10..b6072c626b8 100644
--- a/packages/kilo-vscode/webview-ui/src/App.tsx
+++ b/packages/kilo-vscode/webview-ui/src/App.tsx
@@ -164,6 +164,7 @@ export const LanguageBridge: Component<{ children: any }> = (props) => {
 // Inner app component that uses the contexts
 const AppContent: Component = () => {
   const [currentView, setCurrentView] = createSignal<ViewType>("newTask")
+  const [migrationReturnView, setMigrationReturnView] = createSignal<ViewType>("newTask") // legacy-migration
   const session = useSession()
   const server = useServer()
 
@@ -248,12 +249,20 @@ const AppContent: Component = () => {
           />
         </Match>
         <Match when={currentView() === "settings"}>
-          <Settings onMigrateClick={() => setCurrentView("migration")} />
+          <Settings
+            onMigrateClick={() => {
+              setMigrationReturnView("settings")
+              setCurrentView("migration")
+            }}
+          />
           {/* legacy-migration */}
         </Match>
         {/* legacy-migration start */}
         <Match when={currentView() === "migration"}>
-          <MigrationWizard onBack={() => setCurrentView("newTask")} onComplete={() => setCurrentView("newTask")} />
+          <MigrationWizard
+            onBack={() => setCurrentView(migrationReturnView())}
+            onComplete={() => setCurrentView(migrationReturnView())}
+          />
         </Match>
         {/* legacy-migration end */}
       </Switch>