diff --git a/src/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.js b/src/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.js
index 8b55435..500ddf5 100644
--- a/src/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.js
+++ b/src/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.js
@@ -58,7 +58,7 @@ export default class ElementTemplatesPropertiesProvider {
       };
 
       // (1) Add templates group
-      addGroupsAfter(ALWAYS_DISPLAYED_GROUPS, groups, [ templatesGroup ]);
+      addGroupsAfter('documentation', groups, [ templatesGroup ]);
 
       let elementTemplate = this._elementTemplates.get(element);
 
diff --git a/test/spec/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.spec.js b/test/spec/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.spec.js
index b4815b2..a081b1c 100644
--- a/test/spec/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.spec.js
+++ b/test/spec/cloud-element-templates/properties-panel/ElementTemplatesPropertiesProvider.spec.js
@@ -206,7 +206,7 @@ describe('provider/cloud-element-templates - ElementTemplatesPropertiesProvider'
     }));
 
 
-    it('should show only general, documentation, and execution listeners group, and template-related entries when entriesVisible is unset',
+    it('should show only general, documentation, template group and execution listeners group when entriesVisible is unset',
       inject(async function(elementRegistry, selection) {
 
         // given
@@ -221,14 +221,14 @@ describe('provider/cloud-element-templates - ElementTemplatesPropertiesProvider'
         expectOnlyGroups(container, [
           'general',
           'documentation',
-          'Zeebe__ExecutionListeners',
-          'ElementTemplates__Template'
+          'ElementTemplates__Template',
+          'Zeebe__ExecutionListeners'
         ]);
       })
     );
 
 
-    it('should show only general, documentation, and execution listeners group, and template-related entries when entriesVisible=false',
+    it('should show only general, documentation, template group and execution listeners group when entriesVisible=false',
       inject(async function(elementRegistry, selection) {
 
         // given
@@ -243,14 +243,14 @@ describe('provider/cloud-element-templates - ElementTemplatesPropertiesProvider'
         expectOnlyGroups(container, [
           'general',
           'documentation',
-          'Zeebe__ExecutionListeners',
-          'ElementTemplates__Template'
+          'ElementTemplates__Template',
+          'Zeebe__ExecutionListeners'
         ]);
       })
     );
 
 
-    it('should show only general, documentation, and execution listeners group, and template group when template is unknown',
+    it('should show only general, documentation, template group and execution listeners group when template is unknown',
       inject(async function(elementRegistry, selection) {
 
         // given
@@ -265,8 +265,8 @@ describe('provider/cloud-element-templates - ElementTemplatesPropertiesProvider'
         expectOnlyGroups(container, [
           'general',
           'documentation',
-          'Zeebe__ExecutionListeners',
-          'ElementTemplates__Template'
+          'ElementTemplates__Template',
+          'Zeebe__ExecutionListeners'
         ]);
       })
     );