diff --git a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
index ab19c514..ee494612 100644
--- a/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
+++ b/lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
@@ -26,6 +26,8 @@ import 'package:uae_stat/presentation/components/indicators/locale_provider.dart
 import 'package:uae_stat/presentation/components/my_toggle.dart';
 import 'package:uae_stat/config/api_config.dart';
 
+final selectedIndexProvider = StateProvider<int>((ref) => 0);
+
 class BaseScaffold extends ConsumerStatefulWidget {
   const BaseScaffold({
     super.key,
@@ -1105,7 +1107,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                   const EdgeInsets.only(bottom: 4), // Adjust this for spacing
               child: Image.asset(
                 BottomBarAssetIconPath.globe,
-                color: _getSelectedIndex(currentRoute) == 2
+                color: _getSelectedIndex(currentRoute) == 3
                     ? Colors.black
                     : Color(0xFF989898),
                 width: 20,
@@ -1148,11 +1150,12 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
       case '/countryprofile':
         return 3;
       default:
-        return 0;
+        return ref.read(selectedIndexProvider);
     }
   }
 
   void _onItemTapped(BuildContext context, int index) {
+    ref.read(selectedIndexProvider.notifier).state = index;
     switch (index) {
       case 0:
         context.go('/myhomepage');