diff --git a/app/src/main/res/navigation/circles_nav_graph.xml b/app/src/main/res/navigation/circles_nav_graph.xml
index 2d246ed7449f5acdf9de378eb14a82300a86440d..c71ad40ae0f04e9829f4d630277fa315030cb871 100644
--- a/app/src/main/res/navigation/circles_nav_graph.xml
+++ b/app/src/main/res/navigation/circles_nav_graph.xml
@@ -29,7 +29,7 @@
 
         <action
             android:id="@+id/to_createCircleDialogFragment"
-            app:destination="@id/createCircleDialogFragment">
+            app:destination="@id/create_room_nav_graph">
 
             <argument
                 android:name="type"
@@ -53,22 +53,9 @@
 
     <include app:graph="@navigation/timeline_nav_graph" />
 
-    <dialog
-        android:id="@+id/createCircleDialogFragment"
-        android:name="org.futo.circles.core.feature.room.create.CreateRoomDialogFragment"
-        tools:layout="@layout/dialog_fragment_create_room">
-
-        <argument
-            android:name="type"
-            android:defaultValue="Circle"
-            app:argType="org.futo.circles.core.model.CircleRoomTypeArg"
-            app:nullable="false" />
-
-    </dialog>
     <dialog
         android:id="@+id/acceptCircleInviteDialogFragment"
         android:name="org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDialogFragment"
-        android:label="AcceptCircleInviteDialogFragment"
         tools:layout="@layout/dialog_fragment_accept_circle_invite">
 
         <argument
@@ -78,7 +65,7 @@
 
         <action
             android:id="@+id/to_createCircleDialogFragment"
-            app:destination="@id/createCircleDialogFragment">
+            app:destination="@id/create_room_nav_graph">
 
             <argument
                 android:name="type"
@@ -92,4 +79,6 @@
 
     <include app:graph="@navigation/invites_nav_graph" />
 
+    <include app:graph="@navigation/create_room_nav_graph" />
+
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/groups_nav_graph.xml b/app/src/main/res/navigation/groups_nav_graph.xml
index 36a64c55ddeae84b66e9101bd9dd2e2062d414d0..a2e21a42ab52e66ed8fe0b1141332e09407bc100 100644
--- a/app/src/main/res/navigation/groups_nav_graph.xml
+++ b/app/src/main/res/navigation/groups_nav_graph.xml
@@ -24,7 +24,7 @@
 
         <action
             android:id="@+id/to_createGroupDialogFragment"
-            app:destination="@id/createGroupDialogFragment">
+            app:destination="@id/create_room_nav_graph">
 
             <argument
                 android:name="type"
@@ -52,17 +52,6 @@
 
     <include app:graph="@navigation/invites_nav_graph" />
 
-    <dialog
-        android:id="@+id/createGroupDialogFragment"
-        android:name="org.futo.circles.core.feature.room.create.CreateRoomDialogFragment"
-        tools:layout="@layout/dialog_fragment_create_room">
-
-        <argument
-            android:name="type"
-            android:defaultValue="Group"
-            app:argType="org.futo.circles.core.model.CircleRoomTypeArg"
-            app:nullable="false" />
-
-    </dialog>
+    <include app:graph="@navigation/create_room_nav_graph" />
 
 </navigation>
\ No newline at end of file
diff --git a/core/src/main/res/navigation/create_room_nav_graph.xml b/core/src/main/res/navigation/create_room_nav_graph.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cff91f43e05c9faa902a0675600af3d02754b6b0
--- /dev/null
+++ b/core/src/main/res/navigation/create_room_nav_graph.xml
@@ -0,0 +1,19 @@
+<?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/create_room_nav_graph"
+    app:startDestination="@id/createRoomDialogFragment">
+
+    <dialog
+        android:id="@+id/createRoomDialogFragment"
+        android:name="org.futo.circles.core.feature.room.create.CreateRoomDialogFragment"
+        tools:layout="@layout/dialog_fragment_create_room">
+
+        <argument
+            android:name="type"
+            app:argType="org.futo.circles.core.model.CircleRoomTypeArg"
+            app:nullable="false" />
+
+    </dialog>
+</navigation>
\ No newline at end of file
diff --git a/gallery/src/main/res/navigation/photos_nav_graph.xml b/gallery/src/main/res/navigation/photos_nav_graph.xml
index 287e1f7c924a22a2db52034fcee766e3cac509cd..00d100762a16584e848c7b2d1cb0b59686754fbf 100644
--- a/gallery/src/main/res/navigation/photos_nav_graph.xml
+++ b/gallery/src/main/res/navigation/photos_nav_graph.xml
@@ -13,7 +13,7 @@
 
         <action
             android:id="@+id/to_createGalleryDialogFragment"
-            app:destination="@id/createGalleryDialogFragment">
+            app:destination="@id/create_room_nav_graph">
 
             <argument
                 android:name="type"
@@ -49,18 +49,6 @@
         </action>
     </fragment>
 
-    <dialog
-        android:id="@+id/createGalleryDialogFragment"
-        android:name="org.futo.circles.core.feature.room.create.CreateRoomDialogFragment"
-        tools:layout="@layout/dialog_fragment_create_room">
-
-        <argument
-            android:name="type"
-            android:defaultValue="Photo"
-            app:argType="org.futo.circles.core.model.CircleRoomTypeArg"
-            app:nullable="false" />
-
-    </dialog>
     <dialog
         android:id="@+id/galleryFragment"
         android:name="org.futo.circles.gallery.feature.gallery.GalleryDialogFragment"
@@ -99,4 +87,6 @@
 
     <include app:graph="@navigation/invites_nav_graph" />
 
+    <include app:graph="@navigation/create_room_nav_graph" />
+
 </navigation>
\ No newline at end of file