diff --git a/apps/web/src/components/Dashboard.tsx b/apps/web/src/components/Dashboard.tsx
index e3aa8390..ecff8acb 100644
--- a/apps/web/src/components/Dashboard.tsx
+++ b/apps/web/src/components/Dashboard.tsx
@@ -102,7 +102,7 @@ export default function Dashboard({
   useEffect(() => {
     if (hasLoaded && availableWorkspaces.length === 0) {
       if (env("NEXT_PUBLIC_KAN_ENV") === "cloud") {
-        router.push("/onboarding/select-plan");
+        router.push(`/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`);
       } else {
         openModal("NEW_WORKSPACE", undefined, undefined, false);
       }
diff --git a/apps/web/src/components/WorkspaceMenu.tsx b/apps/web/src/components/WorkspaceMenu.tsx
index 36f5240f..7d8f2ef5 100644
--- a/apps/web/src/components/WorkspaceMenu.tsx
+++ b/apps/web/src/components/WorkspaceMenu.tsx
@@ -152,7 +152,7 @@ export default function WorkspaceMenu({
                 <button
                   onClick={() =>
                     env("NEXT_PUBLIC_KAN_ENV") === "cloud"
-                      ? router.push("/onboarding/select-plan")
+                      ? router.push(`/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`)
                       : openModal("NEW_WORKSPACE")
                   }
                   className="flex w-full items-center justify-between rounded-[5px] px-3 py-2 text-left text-xs text-neutral-900 hover:bg-light-200 dark:text-dark-1000 dark:hover:bg-dark-400"
diff --git a/apps/web/src/views/onboarding/select-plan/index.tsx b/apps/web/src/views/onboarding/select-plan/index.tsx
index fd4fcab7..3c14254d 100644
--- a/apps/web/src/views/onboarding/select-plan/index.tsx
+++ b/apps/web/src/views/onboarding/select-plan/index.tsx
@@ -47,6 +47,7 @@ export default function SelectPlanView() {
   const [billing, setBilling] = useState<Billing>(
     (searchParams.get("billing") as Billing | null) ?? "annual",
   );
+  const returnUrl = searchParams.get("returnUrl") ?? "/boards";
   const { data: workspaces } = api.workspace.all.useQuery();
   const { data: session } = authClient.useSession();
   const { data: user } = api.user.getUser.useQuery(undefined, {
@@ -97,24 +98,18 @@ export default function SelectPlanView() {
 
   const handleSelectPlan = (plan: PlanId) => {
     setSelected(plan);
-    router.replace(`/onboarding/select-plan?plan=${plan}&billing=${billing}`);
+    router.replace(`/onboarding/select-plan?plan=${plan}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`);
   };
 
   const handleSetBilling = (b: Billing) => {
     setBilling(b);
-    router.replace(`/onboarding/select-plan?plan=${selected}&billing=${b}`);
+    router.replace(`/onboarding/select-plan?plan=${selected}&billing=${b}&returnUrl=${encodeURIComponent(returnUrl)}`);
   };
 
   const handleContinue = () =>
-    router.push(`/onboarding/workspace?plan=${selected}&billing=${billing}`);
+    router.push(`/onboarding/workspace?plan=${selected}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`);
 
-  const handleCancel = () => {
-    if (window.history.length > 1) {
-      router.back();
-    } else {
-      router.push("/boards");
-    }
-  };
+  const handleCancel = () => router.push(returnUrl);
 
   return (
     <div className="flex min-h-screen flex-col items-center justify-center gap-4 bg-light-100 px-4 py-8 dark:bg-dark-50 md:px-6">
diff --git a/apps/web/src/views/onboarding/workspace-details/index.tsx b/apps/web/src/views/onboarding/workspace-details/index.tsx
index a9414729..8a92cc92 100644
--- a/apps/web/src/views/onboarding/workspace-details/index.tsx
+++ b/apps/web/src/views/onboarding/workspace-details/index.tsx
@@ -38,6 +38,7 @@ export default function WorkspaceNameView() {
   const searchParams = useSearchParams();
   const plan = searchParams.get("plan") ?? "solo";
   const billing = searchParams.get("billing") ?? "annual";
+  const returnUrl = searchParams.get("returnUrl") ?? "/boards";
   const { showPopup } = usePopup();
   const [isProToggle, setIsProToggle] = useState(plan === "pro");
 
@@ -266,8 +267,8 @@ export default function WorkspaceNameView() {
                 <Button
                   variant="ghost"
                   onClick={() =>
-                    router.push(
-                      `/onboarding/select-plan?plan=${plan}&billing=${billing}`,
+                    router.replace(
+                      `/onboarding/select-plan?plan=${plan}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`,
                     )
                   }
                 >