diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt
index 987a63585a..15b62f4fc1 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt
@@ -788,8 +788,8 @@ open class ObjectSetFragment :
 
     private fun setupNewButtonsForTypeSet(isCreateObjectAllowed: Boolean) {
         if (isCreateObjectAllowed) {
-            addNewButton.visible()
-            addNewIconButton.gone()
+            addNewButton.gone()
+            addNewIconButton.visible()
         } else {
             addNewButton.gone()
             addNewIconButton.gone()
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
index d5454aa26d..d7ecb1ddca 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
@@ -1238,10 +1238,13 @@ class ObjectSetViewModel(
         }
     }
 
-    private suspend fun proceedWithCreatingObjectTypeSetObject(currentState: ObjectState.DataView.TypeSet) {
+    private suspend fun proceedWithCreatingObjectTypeSetObject(
+        currentState: ObjectState.DataView.TypeSet,
+        templateChosenBy: String?
+    ) {
         val objectType = storeOfObjectTypes.get(vmParams.ctx)
 
-        val objectTypeUniqueKey = objectType?.uniqueKey ?:return
+        val objectTypeUniqueKey = objectType?.uniqueKey ?: return
 
         if (objectTypeUniqueKey == ObjectTypeIds.BOOKMARK) {
             dispatch(
@@ -1263,7 +1266,7 @@ class ObjectSetViewModel(
                 CreateDataViewObject.Params.SetByType(
                     type = TypeKey(objectTypeUniqueKey),
                     filters = viewer.filters,
-                    template = objectType.defaultTemplateId,
+                    template = templateChosenBy ?: objectType.defaultTemplateId,
                     prefilled = prefilled
                 )
             )
@@ -2917,7 +2920,8 @@ class ObjectSetViewModel(
 
                 is ObjectState.DataView.TypeSet -> {
                     proceedWithCreatingObjectTypeSetObject(
-                        currentState = state
+                        currentState = state,
+                        templateChosenBy = templateId
                     )
                 }
             }