diff --git a/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt b/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt
index 0c67246dc6..2c1838900c 100644
--- a/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt
+++ b/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt
@@ -192,7 +192,9 @@ class Navigator : AppNavigation {
                     view = view
                 ),
                 navOptions {
-                    popUpTo(R.id.main_navigation) { inclusive = true }
+                    popUpTo(R.id.homeScreen) {
+                        inclusive = false
+                    }
                 }
             )
         } else {
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt
index 5c572ed4be..89a5828efc 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt
@@ -4536,7 +4536,7 @@ class EditorViewModel(
                     Timber.e(it, "Error while closing object")
                     navigate(
                         EventWrapper(
-                            AppNavigation.Command.OpenSetOrCollection(
+                            OpenSetOrCollection(
                                 target = target,
                                 space = space.id,
                                 isPopUpToDashboard
@@ -4547,7 +4547,7 @@ class EditorViewModel(
                 onSuccess = {
                     navigate(
                         EventWrapper(
-                            AppNavigation.Command.OpenSetOrCollection(
+                            OpenSetOrCollection(
                                 target = target,
                                 space = space.id,
                                 isPopUpToDashboard