airhub_app/lib/features/badge/presentation/pages/badge_home_page.dart

@@ -281,7 +281,13 @@ class _BadgeHomePageState extends ConsumerState<BadgeHomePage>
       child: Row(
         children: [
           GestureDetector(
-            onTap: () => context.pop(),
+            onTap: () {
+              if (context.canPop()) {
+                context.pop();
+              } else {
+                context.go('/');
+              }
+            },
             child: Container(
               width: 40,
               height: 40,