diff --git a/lib/logic/app_logic.dart b/lib/logic/app_logic.dart
index ee65f307..8d3b64ff 100644
--- a/lib/logic/app_logic.dart
+++ b/lib/logic/app_logic.dart
@@ -77,7 +77,7 @@ class AppLogic {
 
     // Load initial view (replace empty initial view which is covered by a native splash screen)
     bool showIntro = settingsLogic.hasCompletedOnboarding.value == false;
-    if (showIntro) {
+    if (showIntro || true) {
       appRouter.go(ScreenPaths.intro);
     } else {
       appRouter.go(ScreenPaths.home);
diff --git a/lib/router.dart b/lib/router.dart
index 35ee0d67..d8232a5c 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -38,7 +38,15 @@ final appRouter = GoRouter(
         },
         routes: [
           AppRoute(ScreenPaths.splash, (_) => Container(color: $styles.colors.greyStrong)), // This will be hidden
-          AppRoute(ScreenPaths.home, (_) => HomeScreen()),
+          AppRoute(ScreenPaths.home, (_) => HomeScreen(), routes: [
+            AppRoute('wonder/:type', (s) {
+              int tab = int.tryParse(s.queryParams['t'] ?? '') ?? 0;
+              return WonderDetailsScreen(
+                type: _parseWonderType(s.params['type']),
+                initialTabIndex: tab,
+              );
+            }, useFade: true),
+          ]),
           AppRoute(ScreenPaths.intro, (_) => IntroScreen()),
           AppRoute('/wonder/:type', (s) {
             int tab = int.tryParse(s.queryParams['t'] ?? '') ?? 0;
diff --git a/lib/ui/screens/home/wonders_home_screen.dart b/lib/ui/screens/home/wonders_home_screen.dart
index 8d7e6dcf..e994cd5b 100644
--- a/lib/ui/screens/home/wonders_home_screen.dart
+++ b/lib/ui/screens/home/wonders_home_screen.dart
@@ -104,7 +104,7 @@ class _HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateM
 
   void _showDetailsPage() async {
     _swipeOverride = _swipeController.swipeAmt.value;
-    context.push(ScreenPaths.wonderDetails(currentWonder.type));
+    context.go('${ScreenPaths.home}${ScreenPaths.wonderDetails(currentWonder.type)}');
     await Future.delayed(100.ms);
     _swipeOverride = null;
     _fadeInOnNextBuild = true;