diff --git a/assets/js/app/editor/Components/Collection.vue b/assets/js/app/editor/Components/Collection.vue
index b33fb839b..653c3d07a 100644
--- a/assets/js/app/editor/Components/Collection.vue
+++ b/assets/js/app/editor/Components/Collection.vue
@@ -16,7 +16,7 @@
     </div>
 
     <div
-      v-for="element in existingFields"
+      v-for="element in elements"
       :key="element.hash"
       class="collection-item"
     >
@@ -37,9 +37,7 @@
       </details>
     </div>
 
-    <small>{{ labels.select_tooltip }}</small>
-
-    <div class="dropdown">
+    <div v-if="templates.length > 1" class="dropdown">
       <button
         id="dropdownMenuButton"
         :disabled="!allowMore"
@@ -64,6 +62,16 @@
         </a>
       </div>
     </div>
+    <button
+      v-else
+      type="button"
+      class="btn btn-secondary btn-small"
+      :data-template="templates[0].label"
+      @click="addCollectionItem($event)"
+    >
+      <i :class="[templates[0].icon, 'fas fa-fw']" />
+      {{ labels.add_collection_item }}
+    </button>
   </div>
 </template>
 
diff --git a/templates/_partials/fields/collection.html.twig b/templates/_partials/fields/collection.html.twig
index 416385ff0..8a8e9bcfc 100644
--- a/templates/_partials/fields/collection.html.twig
+++ b/templates/_partials/fields/collection.html.twig
@@ -6,7 +6,6 @@
         'add_collection_item': 'collection.add_item'|trans({'%name%': field.definition.label}),
         'expand_all': 'collection.expand_all'|trans,
         'collapse_all': 'collection.collapse_all'|trans,
-        'select_tooltip': 'collection.select_tooltip'|trans,
         'field_label': label,
     } %}
     {% set limit = field.definition.get('limit')|default(200) %}
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 07fa7d391..86ba6de95 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -2361,11 +2361,5 @@
         <target>Collapse all</target>
       </segment>
     </unit>
-    <unit id="wAltpsD" name="collection.select_tooltip">
-      <segment>
-        <source>collection.select_tooltip</source>
-        <target>Select type of field to add</target>
-      </segment>
-    </unit>
   </file>
 </xliff>