diff --git a/shared/components/rstack-app-switcher.ts b/shared/components/rstack-app-switcher.ts
index 2d82152..cae1728 100644
--- a/shared/components/rstack-app-switcher.ts
+++ b/shared/components/rstack-app-switcher.ts
@@ -187,11 +187,12 @@ export class RStackAppSwitcher extends HTMLElement {
 			: `<span class="item-icon">${m.icon}</span>`;
 
 		const space = this.#getSpaceSlug();
-		// On demo (bare domain, demo subdomain, or standalone r*.online): link to landing pages
+		// On bare domain or standalone r*.online: link to landing pages.
+		// On demo.rspace.online or user subdomains: use rspaceNavUrl for in-app navigation.
 		const host = window.location.host.split(":")[0];
-		const onRspace = host.includes("rspace.online");
+		const isBareDomain = host === "rspace.online" || host === "www.rspace.online";
 		const href =
-			(onRspace && space === "demo") || isStandaloneDomain()
+			(isBareDomain || isStandaloneDomain())
 				? `${window.location.protocol}//rspace.online/${m.id}`
 				: rspaceNavUrl(space, m.id);