diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4fd01a1897..82de33d701 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @quaterma1n @fat-fellow @konstantiniiv @uburoiubu
\ No newline at end of file
+* @konstantiniiv @uburoiubu
\ No newline at end of file
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt
index 2ac4693e40..94fb068baf 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt
@@ -45,16 +45,24 @@ class SelectWidgetTypeViewModel(
     ) {
         Timber.d("onStart for existing widget")
         if (BundledWidgetSourceIds.ids.contains(source)) {
-            views.value = listOf(
-                WidgetTypeView.Tree().setIsSelected(currentType),
-                WidgetTypeView.List().setIsSelected(currentType)
-            )
+            if (source == BundledWidgetSourceIds.FAVORITE || source == BundledWidgetSourceIds.RECENT) {
+                views.value = listOf(
+                    WidgetTypeView.CompactList().setIsSelected(currentType),
+                    WidgetTypeView.List().setIsSelected(currentType),
+                    WidgetTypeView.Tree().setIsSelected(currentType),
+                )
+            } else {
+                views.value = listOf(
+                    WidgetTypeView.CompactList().setIsSelected(currentType),
+                    WidgetTypeView.List().setIsSelected(currentType)
+                )
+            }
         } else {
             val objectLayout = ObjectType.Layout.values().find { it.code == sourceLayout }
             if (objectLayout.isDataView()) {
                 views.value = listOf(
-                    WidgetTypeView.List().setIsSelected(currentType),
                     WidgetTypeView.CompactList().setIsSelected(currentType),
+                    WidgetTypeView.List().setIsSelected(currentType),
                     WidgetTypeView.Link().setIsSelected(currentType)
                 )
             } else {
@@ -66,16 +74,29 @@ class SelectWidgetTypeViewModel(
     fun onStartForNewWidget(layout: Int, source: Id) {
         Timber.d("onStart for new widget")
         if (BundledWidgetSourceIds.ids.contains(source)) {
-            views.value = listOf(
-                WidgetTypeView.Tree(isSelected = false),
-                WidgetTypeView.List(isSelected = false)
-            )
+            if (source == BundledWidgetSourceIds.FAVORITE || source == BundledWidgetSourceIds.RECENT) {
+                views.value = listOf(
+                    WidgetTypeView.CompactList(isSelected = false),
+                    WidgetTypeView.List(isSelected = false),
+                    WidgetTypeView.Tree(isSelected = false),
+                )
+            } else {
+                views.value = listOf(
+                    WidgetTypeView.CompactList(isSelected = false),
+                    WidgetTypeView.List(isSelected = false),
+                )
+            }
         } else {
             val objectLayout = ObjectType.Layout.values().find { it.code == layout }
             if (objectLayout.isDataView()) {
                 views.value = listOf(
-                    WidgetTypeView.List(isSelected = false),
                     WidgetTypeView.CompactList(isSelected = false),
+                    WidgetTypeView.List(isSelected = false),
+                    WidgetTypeView.Link(isSelected = false)
+                )
+            } else {
+                views.value = listOf(
+                    WidgetTypeView.Tree(isSelected = false),
                     WidgetTypeView.Link(isSelected = false)
                 )
             }