diff --git a/app/controllers/controller.js b/app/controllers/controller.js
index 61ab521..c6c35f9 100644
--- a/app/controllers/controller.js
+++ b/app/controllers/controller.js
@@ -109,8 +109,8 @@
     //helpers for determining if the add button should be shown
     $scope.showAddButton = function () {
         return $scope.model.config.startWithAddButton
-            && countVisible() === 0
-            && $scope.model.config.fieldsets.length == 1;
+            && countVisible() === 0;
+            ///&& $scope.model.config.fieldsets.length == 1;
     }
 
     //helper, ini the render model from the server (model.value)
diff --git a/app/less/archetype.less b/app/less/archetype.less
index a61d0fa..0fa2209 100644
--- a/app/less/archetype.less
+++ b/app/less/archetype.less
@@ -1,5 +1,9 @@
 .archetypeEditor {
     width: 98%;
+
+    .dropdown-menu {
+        top: auto;
+    }
 }
 
 .archetypeEditor fieldset{
diff --git a/app/views/archetype.html b/app/views/archetype.html
index 343b956..6cf11d0 100644
--- a/app/views/archetype.html
+++ b/app/views/archetype.html
@@ -46,9 +46,17 @@
         </li>
     </ul>
     <div ng-show="showAddButton()">
-        <a class="archetypeAddButton" href="#" ng-click="addRow(model.config.fieldsets[0].alias, 0)" prevent-default="">
-            <i class="icon icon-add"></i>
+        <a data-toggle="{{ model.config.fieldsets.length > 1 ? 'dropdown' : ''}}" ng-click="model.config.fieldsets.length == 1 ? addRow(fieldset.alias, 0) : return" prevent-default>
+            <i class="icon icon-add dropdown-toggle"></i>
             <localize key="general_add" class="archetypeAddButtonText">Add</localize>
         </a>
+        <ul class="dropdown-menu umb-actions">
+            <li ng-repeat="fieldsetModel in model.config.fieldsets" ng-click="addRow(fieldsetModel.alias, 0)">
+                <a>
+                    <i class="fieldsetIcon icon ng-class:fieldsetModel.icon"></i>
+                    <span class="menu-label">{{fieldsetModel.label}}</span>
+                </a>
+            </li>
+        </ul>
     </div>
 </div>