diff --git a/app/less/archetype.less b/app/less/archetype.less
index eb06cfc..980a997 100644
--- a/app/less/archetype.less
+++ b/app/less/archetype.less
@@ -38,8 +38,10 @@
     }
 
     label{
-        width: 75px;
         float: left;
+        width: 90%;
+        margin-bottom: 0;
+        padding: 0;
     }
 }
 
@@ -53,13 +55,6 @@
     border-radius: 0 0 0 5px;
 }
 
-.archetypeEditor fieldset .archetypeFieldsetLabel label{
-    float: left;
-    width: auto;
-    margin-bottom: 0;
-    padding: 0;
-}
-
 .archetypeEditor .multiPropertyTextbox{
     margin-bottom: 3px;
 }
diff --git a/app/views/archetype.html b/app/views/archetype.html
index 1cba82e..b98b5f4 100644
--- a/app/views/archetype.html
+++ b/app/views/archetype.html
@@ -12,11 +12,11 @@
     <ul ui-sortable="sortableOptions" ng-model="archetypeRenderModel.fieldsets">
         <li ng-repeat="fieldset in archetypeRenderModel.fieldsets" ng-hide="fieldset.remove">
             <fieldset ng-class="{archetypeFieldsetError: !fieldset.isValid}" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
-                <div class="archetypeFieldsetLabel" ng-click="focusFieldset(fieldset)">
+                <div class="archetypeFieldsetLabel">
                     <span class="caret" ng-hide="fieldset.collapse"></span>
                     <span class="caret caret-right" ng-show="fieldset.collapse"></span>
 
-                    <label ng-hide="model.config.hideFieldsetLabels == '1'">
+                    <label ng-hide="model.config.hideFieldsetLabels == '1'" ng-click="focusFieldset(fieldset)">
                         <img ng-src='{{fieldsetConfigModel.icon}}' title="{{fieldsetConfigModel.tooltip}}" />
                         <span ng-bind="getFieldsetTitle(fieldsetConfigModel, $index)"></span>
                     </label>