diff --git a/app/src/main/res/navigation/settings_nav_graph.xml b/app/src/main/res/navigation/settings_nav_graph.xml
index f4e9516a4a7bc25e34d310253aa49db3ca94e132..429c40be504edd3d1e8f8bb768994c5b719fdfff 100644
--- a/app/src/main/res/navigation/settings_nav_graph.xml
+++ b/app/src/main/res/navigation/settings_nav_graph.xml
@@ -24,7 +24,7 @@
             app:destination="@id/reAuthStagesDialogFragment" />
         <action
             android:id="@+id/to_shareProfileDialogFragment"
-            app:destination="@id/shareRoomDialogFragment">
+            app:destination="@id/share_room_nav_graph">
 
             <argument
                 android:name="roomId"
@@ -53,22 +53,7 @@
         android:label="ChangePasswordDialogFragment"
         tools:layout="@layout/dialog_fragment_change_password" />
 
-    <dialog
-        android:id="@+id/shareRoomDialogFragment"
-        android:name="org.futo.circles.core.room.share.ShareRoomDialogFragment"
-        tools:layout="@layout/dialog_fragment_share_room">
-
-        <argument
-            android:name="roomId"
-            app:argType="string"
-            app:nullable="false" />
-
-        <argument
-            android:name="isProfile"
-            app:argType="boolean"
-            app:nullable="false" />
-
-    </dialog>
+    <include app:graph="@navigation/share_room_nav_graph" />
 
     <dialog
         android:id="@+id/pushNotificationsSettingsDialogFragment"
diff --git a/core/src/main/res/navigation/share_room_nav_graph.xml b/core/src/main/res/navigation/share_room_nav_graph.xml
new file mode 100644
index 0000000000000000000000000000000000000000..102368b126a4431cdcdea0e47513441eb7166937
--- /dev/null
+++ b/core/src/main/res/navigation/share_room_nav_graph.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/share_room_nav_graph"
+    app:startDestination="@id/shareRoomDialogFragment">
+    <dialog
+        android:id="@+id/shareRoomDialogFragment"
+        android:name="org.futo.circles.core.room.share.ShareRoomDialogFragment"
+        tools:layout="@layout/dialog_fragment_share_room">
+
+        <argument
+            android:name="roomId"
+            app:argType="string"
+            app:nullable="false" />
+
+        <argument
+            android:name="isProfile"
+            app:argType="boolean"
+            app:nullable="false" />
+
+    </dialog>
+</navigation>
\ No newline at end of file
diff --git a/core/src/main/res/navigation/timeline_options_nav_graph.xml b/core/src/main/res/navigation/timeline_options_nav_graph.xml
index be057a07db03101d59b976926e40fe97abb7db6e..c38d7ef0832b365101574d9efe4e017d31d3323d 100644
--- a/core/src/main/res/navigation/timeline_options_nav_graph.xml
+++ b/core/src/main/res/navigation/timeline_options_nav_graph.xml
@@ -21,7 +21,7 @@
 
         <action
             android:id="@+id/to_shareRoom"
-            app:destination="@id/shareRoomDialogFragment">
+            app:destination="@id/share_room_nav_graph">
 
             <argument
                 android:name="roomId"
@@ -152,22 +152,6 @@
 
     </dialog>
 
-    <dialog
-        android:id="@+id/shareRoomDialogFragment"
-        android:name="org.futo.circles.core.room.share.ShareRoomDialogFragment"
-        tools:layout="@layout/dialog_fragment_share_room">
-
-        <argument
-            android:name="roomId"
-            app:argType="string"
-            app:nullable="false" />
-
-        <argument
-            android:name="isProfile"
-            app:argType="boolean"
-            app:nullable="false" />
-
-    </dialog>
     <dialog
         android:id="@+id/updateGroupDialogFragment"
         android:name="org.futo.circles.core.room.update.group.UpdateGroupDialogFragment"
@@ -261,4 +245,7 @@
             app:nullable="false" />
 
     </dialog>
+
+    <include app:graph="@navigation/share_room_nav_graph" />
+
 </navigation>