diff --git a/app/src/main/java/li/dadada/uuidgen/ui/MainActivity.kt b/app/src/main/java/li/dadada/uuidgen/ui/MainActivity.kt
index ad0154c..dcdd416 100644
--- a/app/src/main/java/li/dadada/uuidgen/ui/MainActivity.kt
+++ b/app/src/main/java/li/dadada/uuidgen/ui/MainActivity.kt
@@ -28,7 +28,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
         return when (item.itemId) {
             R.id.action_history -> {
                 findNavController(R.id.nav_host_fragment)
-                    .navigate(R.id.action_uuid_gen_fragment_to_uuid_list_fragment)
+                    .navigate(R.id.action_global_uuid_list_fragment)
                 true
             }
             else -> super.onOptionsItemSelected(item)
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 0865968..8da626b 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -8,15 +8,14 @@
     <fragment
         android:id="@+id/uuid_gen_fragment"
         android:name="li.dadada.uuidgen.ui.UuidGenFragment"
-        android:label="@string/first_fragment_label"
-        tools:layout="@layout/uuid_list_fragment" >
-        <action
-            android:id="@+id/action_uuid_gen_fragment_to_uuid_list_fragment"
-            app:destination="@id/uuid_list_fragment" />
+        android:label="@string/first_fragment_label">
     </fragment>
 
     <fragment
         android:id="@+id/uuid_list_fragment"
-        android:name="li.dadada.uuidgen.ui.UuidListFragment"
-        tools:layout="@layout/uuid_list_fragment" />
+        android:name="li.dadada.uuidgen.ui.UuidListFragment" />
+
+    <action android:id="@+id/action_global_uuid_list_fragment"
+        app:destination="@id/uuid_list_fragment"/>
+
 </navigation>
\ No newline at end of file