diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html
index 86077483cd..877fb95363 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html
@@ -1,14 +1,14 @@
 <div class="container-widget">
-    <div *ngIf="content?.isGroup()" class="container-widget__header">
-        <h4 class="container-widget__header-text"
-            [class.collapsible]="content?.isCollapsible()" [hidden]="!content?.isVisible">
+    <div *ngIf="content?.isGroup() && content?.isVisible" class="container-widget__header">
+        <h4 class="container-widget__header-text" id="container-header"
+            [class.collapsible]="content?.isCollapsible()">
             <button *ngIf="content?.isCollapsible()"
                     alfresco-mdl-button
                     class="mdl-button--icon"
                     (click)="onExpanderClicked()">
                 <i class="material-icons">{{ content?.isExpanded ? 'expand_less' : 'expand_more' }}</i>
             </button>
-            <span (click)="onExpanderClicked()">{{content.name}}</span>
+            <span (click)="onExpanderClicked()" id="container-header-label">{{content.name}}</span>
         </h4>
     </div>
     <div class="mdl-grid" *ngIf="content?.isExpanded">