diff --git a/app/lib/common/widgets/tutorial/show_app_tour.dart b/app/lib/common/widgets/tutorial/show_app_tour.dart
index ea131bf1..17c0b5fe 100644
--- a/app/lib/common/widgets/tutorial/show_app_tour.dart
+++ b/app/lib/common/widgets/tutorial/show_app_tour.dart
@@ -90,11 +90,11 @@ FutureOr<void> showAppTour(
       onClose: revisiting
         ? null
         : () async {
-          MetaData.instance.tutorialDone = true;
-          await MetaData.save();
-          // ignore: use_build_context_synchronously
-          await overwriteRoutes(context, nextPage: MainRoute());
-        },
+            MetaData.instance.tutorialDone = true;
+            await MetaData.save();
+            // ignore: use_build_context_synchronously
+            await overwriteRoutes(context, nextPage: MainRoute());
+          },
       lastNextButtonText: lastNextButtonText,
       firstBackButtonText: revisiting ? null : context.l10n.onboarding_prev,
     );
\ No newline at end of file
diff --git a/app/lib/common/widgets/tutorial/tutorial_builder.dart b/app/lib/common/widgets/tutorial/tutorial_builder.dart
index 006cdb07..ca0b2ebc 100644
--- a/app/lib/common/widgets/tutorial/tutorial_builder.dart
+++ b/app/lib/common/widgets/tutorial/tutorial_builder.dart
@@ -145,8 +145,13 @@ class TutorialBuilder extends HookWidget {
     ValueNotifier<int> currentPageIndex,
   ) {
     final isFirstPage = currentPageIndex.value == 0;
-    final showFirstButton =
-      !isFirstPage || firstBackButtonText.isNotNullOrBlank;
+    final showFirstButton = !isFirstPage || (
+      firstBackButtonText.isNotNullOrBlank &&
+      context.router.canPop(
+        ignoreChildRoutes: true,
+        ignorePagelessRoutes: true,
+      )
+    );
     final isLastPage = currentPageIndex.value == pages.length - 1;
     final directionButtonTextStyle =
       PharMeTheme.textTheme.titleLarge!.copyWith(fontSize: 20);
@@ -164,7 +169,9 @@ class TutorialBuilder extends HookWidget {
               initiateRouteBack();
               final currentRoute = context.router.current.name;
               context.router.popUntil(
-                (route) => route.settings.name != null && route.settings.name != currentRoute,
+                (route) =>
+                  route.settings.name != null &&
+                  route.settings.name != currentRoute,
               );
             }
             : () => currentPageIndex.value = currentPageIndex.value - 1,