diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java
index afff4dd1..23071db6 100644
--- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java
+++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java
@@ -102,7 +102,7 @@ public class PetDetailFragment extends Fragment {
                 if (resource.status == Resource.Status.SUCCESS) {
                     ActivityLogger.logChange(requireContext(), "Pet", "UPDATED", petId);
                     Toast.makeText(getContext(), "Pet updated successfully!", Toast.LENGTH_SHORT).show();
-                    navigateBack();
+                    navigateToPetList();
                 } else if (resource.status == Resource.Status.ERROR) {
                     Toast.makeText(getContext(), "Error: " + resource.message, Toast.LENGTH_SHORT).show();
                 }
@@ -113,7 +113,7 @@ public class PetDetailFragment extends Fragment {
                 if (resource.status == Resource.Status.SUCCESS) {
                     ActivityLogger.log(requireContext(), "Added new Pet: " + name);
                     Toast.makeText(getContext(), "Pet added successfully!", Toast.LENGTH_SHORT).show();
-                    navigateBack();
+                    navigateToPetList();
                 } else if (resource.status == Resource.Status.ERROR) {
                     Toast.makeText(getContext(), "Error: " + resource.message, Toast.LENGTH_SHORT).show();
                 }
@@ -130,13 +130,20 @@ public class PetDetailFragment extends Fragment {
                     if (resource.status == Resource.Status.SUCCESS) {
                         ActivityLogger.logChange(requireContext(), "Pet", "DELETED", petId);
                         Toast.makeText(getContext(), "Pet deleted successfully!", Toast.LENGTH_SHORT).show();
-                        navigateBack();
+                        navigateToPetList();
                     } else if (resource.status == Resource.Status.ERROR) {
                         Toast.makeText(getContext(), "Delete failed: " + resource.message, Toast.LENGTH_SHORT).show();
                     }
                 }));
     }
 
+    /**
+     * Navigates back to the pet list screen.
+     */
+    private void navigateToPetList() {
+        NavHostFragment.findNavController(this).popBackStack(R.id.nav_pet, false);
+    }
+
     /**
      * Navigates back to the previous screen.
      */