diff --git a/app/src/main/java/io/netbird/client/MainActivity.java b/app/src/main/java/io/netbird/client/MainActivity.java
index 666b950..a4c5403 100644
--- a/app/src/main/java/io/netbird/client/MainActivity.java
+++ b/app/src/main/java/io/netbird/client/MainActivity.java
@@ -317,9 +317,11 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             return true;
         }
 
-        navController.navigate(id);
+        // Use NavigationUI which handles launchSingleTop and saveState/restoreState
+        // This prevents fragment recreation and preserves state when alternating between destinations
+        boolean isHandled = NavigationUI.onNavDestinationSelected(item, navController);
         binding.drawerLayout.closeDrawers();
-        return false;
+        return isHandled;
     }
 
     @Override