diff --git a/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart b/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart
index a9e03fbc..3bb9ea40 100644
--- a/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart	
+++ b/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart	
@@ -427,10 +427,10 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
         // print(data_set);
         final encodedMainTopic = Uri.encodeComponent(mainTopic);
         final encodedTitle = Uri.encodeComponent(title);
-
+        final encodedKey = Uri.encodeQueryComponent('uaenumbers');
         // Pass mainTopic and title as query parameters
         context.push(
-            '/chartScreen/$data_set?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle');
+            '/chartScreen/$data_set?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey');
         // context.go('/chartScreen/$data_set');
       },
       child: Card(
diff --git a/lib/presentation/Screens/charts/screens/chart_screen.dart b/lib/presentation/Screens/charts/screens/chart_screen.dart
index dd771b50..0e5fb1f3 100644
--- a/lib/presentation/Screens/charts/screens/chart_screen.dart
+++ b/lib/presentation/Screens/charts/screens/chart_screen.dart
@@ -2096,6 +2096,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
   Widget build(BuildContext context) {
     final locale = ref.watch(localeProvider);
     final localeNotifier = ref.read(localeProvider.notifier);
+    String url=GoRouterState.of(context).uri.toString();
+    final uri = Uri.parse(url);
+    final pageTitle = uri.queryParameters['key'] ?? '';
 
     final isConnected = ref.watch(connectivityProvider);
 
@@ -2184,7 +2187,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
 
       child: BaseScaffold(
           key: _scaffoldKey,
-          title: Text(
+          title: (pageTitle == 'home')
+              ?  Text(AppLocalizations.of(context)!.nav_home)
+              : Text(
             context.translate(
               'UAE Numbers',
               'أرقام الإمارات',
diff --git a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
index ee494612..e0da5e82 100644
--- a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
+++ b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
@@ -95,6 +95,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
     locale = ref.read(localeProvider) ?? const Locale('en');
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _startAppbarTour();
+      _routeToIndex();
     });
   }
 
@@ -697,6 +698,17 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
   // }
   final PAuthRepo _authRepo = PAuthRepo();
 
+  void _routeToIndex() {
+    String url=GoRouterState.of(context).uri.toString();
+    final uri = Uri.parse(url);
+    final fromValue = uri.queryParameters['key'] ?? '';
+    if (fromValue=='home'){
+      ref.read(selectedIndexProvider.notifier).state= 0;
+    }else if (fromValue=='uaenumbers'){
+      ref.read(selectedIndexProvider.notifier).state= 1;
+    }
+  }
+
   Future<void> logout(BuildContext context) async {
     final prefs = await SharedPreferences.getInstance();
     await _authRepo.logout();