diff --git a/src/cloud-element-templates/ElementTemplatesPropertiesProvider.js b/src/cloud-element-templates/ElementTemplatesPropertiesProvider.js
index 9030823f..ab4a83ec 100644
--- a/src/cloud-element-templates/ElementTemplatesPropertiesProvider.js
+++ b/src/cloud-element-templates/ElementTemplatesPropertiesProvider.js
@@ -17,6 +17,7 @@ const LOWER_PRIORITY = 300;
 
 const ALWAYS_DISPLAYED_GROUPS = [
   'general',
+  'documentation',
   'multiInstance'
 ];
 
diff --git a/test/spec/cloud-element-templates/ElementTemplatesPropertiesProvider.spec.js b/test/spec/cloud-element-templates/ElementTemplatesPropertiesProvider.spec.js
index 49b8ca75..2f93dd28 100644
--- a/test/spec/cloud-element-templates/ElementTemplatesPropertiesProvider.spec.js
+++ b/test/spec/cloud-element-templates/ElementTemplatesPropertiesProvider.spec.js
@@ -199,7 +199,7 @@ describe('provider/cloud-element-templates - ElementTemplates', function() {
     }));
 
 
-    it('should show only general group, and template-related entries when entriesVisible is unset',
+    it('should show only general and documentation group, and template-related entries when entriesVisible is unset',
       inject(async function(elementRegistry, selection) {
 
         // given
@@ -213,13 +213,14 @@ describe('provider/cloud-element-templates - ElementTemplates', function() {
         // then
         expectOnlyGroups(container, [
           'general',
+          'documentation',
           'ElementTemplates__Template'
         ]);
       })
     );
 
 
-    it('should show only general group, and template-related entries when entriesVisible=false',
+    it('should show only general and documentation group, and template-related entries when entriesVisible=false',
       inject(async function(elementRegistry, selection) {
 
         // given
@@ -233,13 +234,14 @@ describe('provider/cloud-element-templates - ElementTemplates', function() {
         // then
         expectOnlyGroups(container, [
           'general',
+          'documentation',
           'ElementTemplates__Template'
         ]);
       })
     );
 
 
-    it('should show only general group, and template group when template is unknown',
+    it('should show only general and documentation group, and template group when template is unknown',
       inject(async function(elementRegistry, selection) {
 
         // given
@@ -253,6 +255,7 @@ describe('provider/cloud-element-templates - ElementTemplates', function() {
         // then
         expectOnlyGroups(container, [
           'general',
+          'documentation',
           'ElementTemplates__Template'
         ]);
       })
@@ -737,7 +740,32 @@ describe('provider/cloud-element-templates - ElementTemplates', function() {
         expect(group).to.exist;
       })
     );
+
+  });
+
+
+  describe('documentation', function() {
+
+    it('should display documentation section', inject(
+      async function(elementRegistry, selection, modeling, bpmnFactory) {
+
+        // given
+        const element = elementRegistry.get('Task_1');
+
+        // when
+        await act(() => {
+          selection.select(element);
+        });
+
+        // then
+        const group = domQuery('[data-group-id="group-documentation"]', container);
+
+        expect(group).to.exist;
+      })
+    );
+
   });
+
 });