diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
index e286f89f..cf47e15c 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
@@ -138,7 +138,7 @@ public class AlbumPageFragment extends Fragment {
             if(artist != null) {
                 Bundle bundle = new Bundle();
                 bundle.putParcelable("artist_object", artist);
-               activity.navController.navigate(R.id.artistPageFragment, bundle);
+               activity.navController.navigate(R.id.action_albumPageFragment_to_artistPageFragment, bundle);
             }
             else Toast.makeText(requireContext(), "Error retrieving artist", Toast.LENGTH_SHORT).show();
         });
@@ -147,7 +147,7 @@ public class AlbumPageFragment extends Fragment {
             Bundle bundle = new Bundle();
             bundle.putString(Song.BY_YEAR, Song.BY_YEAR);
             bundle.putInt("year_object", albumPageViewModel.getAlbum().getYear());
-            activity.navController.navigate(R.id.songListPageFragment, bundle);
+            activity.navController.navigate(R.id.action_albumPageFragment_to_songListPageFragment, bundle);
         });
     }
 
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 4a9a12b6..5a141f95 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -204,7 +204,14 @@
         android:id="@+id/albumPageFragment"
         android:name="com.cappielloantonio.play.ui.fragment.AlbumPageFragment"
         android:label="AlbumPageFragment"
-        tools:layout="@layout/fragment_album_page" />
+        tools:layout="@layout/fragment_album_page">
+        <action
+            android:id="@+id/action_albumPageFragment_to_artistPageFragment"
+            app:destination="@id/artistPageFragment" />
+        <action
+            android:id="@+id/action_albumPageFragment_to_songListPageFragment"
+            app:destination="@id/songListPageFragment" />
+    </fragment>
     <fragment
         android:id="@+id/songListPageFragment"
         android:name="com.cappielloantonio.play.ui.fragment.SongListPageFragment"