diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 3c07d15..60c353f 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -313,6 +313,22 @@ const showOnboarding = ref(false)
 const onboardingMode = ref('main')
 const onboardingSettings = ref(null)
 const onboardingReplay = ref(false)
+
+// Expand the sidebar while the onboarding tour is visible so steps that point
+// at sidebar entries (account card, announcement, create instance) can find
+// their targets. The previous state is restored when the tour ends.
+let sidebarStateBeforeOnboarding: boolean | undefined
+watch(showOnboarding, (visible) => {
+	if (visible) {
+		sidebarStateBeforeOnboarding = sidebarToggled.value
+		sidebarToggled.value = true
+		setSidebarExpanded(true)
+	} else if (sidebarStateBeforeOnboarding !== undefined) {
+		sidebarToggled.value = sidebarStateBeforeOnboarding
+		setSidebarExpanded(sidebarStateBeforeOnboarding)
+		sidebarStateBeforeOnboarding = undefined
+	}
+})
 const nativeDecorations = ref(false)
 
 const os = ref('')
@@ -2509,7 +2525,10 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
 			>
 				<div id="sidebar-teleport-target" class="sidebar-teleport-content contents"></div>
 				<div class="sidebar-default-content hidden" :class="{ 'sidebar-enabled': sidebarVisible }">
-					<div class="p-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid">
+					<div
+						data-onboarding-id="sidebar-accounts"
+						class="p-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid"
+					>
 						<h3 class="text-base text-primary font-medium m-0">
 							{{ formatMessage(messages.userInformation) }}
 						</h3>
diff --git a/apps/app-frontend/src/components/ui/onboarding/onboardingConfig.ts b/apps/app-frontend/src/components/ui/onboarding/onboardingConfig.ts
index 45522b3..de0ae0e 100644
--- a/apps/app-frontend/src/components/ui/onboarding/onboardingConfig.ts
+++ b/apps/app-frontend/src/components/ui/onboarding/onboardingConfig.ts
@@ -381,7 +381,7 @@ export const onboardingTours: Record<OnboardingMode, OnboardingStep[]> = {
 		),
 		inspect(
 			'account-login',
-			'account-entry',
+			'sidebar-accounts',
 			onboardingMessages.accountLoginTitle,
 			onboardingMessages.accountLoginDescription,
 		),
@@ -391,11 +391,15 @@ export const onboardingTours: Record<OnboardingMode, OnboardingStep[]> = {
 			onboardingMessages.announcementTitle,
 			onboardingMessages.announcementDescription,
 		),
-		inspect(
+		step(
 			'create-starlight',
-			'create-instance',
-			onboardingMessages.createStarlightTitle,
-			onboardingMessages.createStarlightDescription,
+			'navigate',
+			copy(
+				onboardingMessages.createStarlightTitle,
+				onboardingMessages.createStarlightDescription,
+				onboardingMessages.clickCreate,
+			),
+			control('create-instance', '/create'),
 		),
 		step(
 			'discover-navigation',
@@ -405,7 +409,7 @@ export const onboardingTours: Record<OnboardingMode, OnboardingStep[]> = {
 				onboardingMessages.discoverDescription,
 				onboardingMessages.clickDiscover,
 			),
-			control('nav-discover', '/browse/modpack'),
+			control('nav-discover', '/browse'),
 		),
 		inspect(
 			'discover-content',
diff --git a/apps/app-frontend/src/components/ui/onboarding/useOnboardingTour.ts b/apps/app-frontend/src/components/ui/onboarding/useOnboardingTour.ts
index d32bbca..cc329c1 100644
--- a/apps/app-frontend/src/components/ui/onboarding/useOnboardingTour.ts
+++ b/apps/app-frontend/src/components/ui/onboarding/useOnboardingTour.ts
@@ -284,7 +284,7 @@ export function useOnboardingTour(
 		if (clickedElement && handleBranchClick(clickedElement)) return
 		if (!targetElement.value?.contains(event.target as Node)) return
 
-		if (step.value.expectedPath && route.path !== step.value.expectedPath) {
+		if (step.value.expectedPath && !route.path.startsWith(step.value.expectedPath)) {
 			waitingForRoute.value = true
 			return
 		}
@@ -301,7 +301,7 @@ export function useOnboardingTour(
 		() => route.path,
 		(path) => {
 			if (!waitingForRoute.value || !step.value.expectedPath) return
-			if (path !== step.value.expectedPath) return
+			if (!path.startsWith(step.value.expectedPath)) return
 			waitingForRoute.value = false
 			void advance()
 		},