diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
index 179d3f54196cc81e051c0794ec120ca3aed67373..fe731ce7b185b6ab9dd3f7c1680ea19f3a4ce5b6 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
@@ -618,9 +618,9 @@ public class GTAWorkflowEditController extends FormBasicController {
 				} else {
 					chooseGroupButton.setI18nKey("create.groups");
 				}
-				groupListEl.getRootForm().submit(ureq);
 				cmc.deactivate();
 				cleanUp();
+				groupListEl.getRootForm().submit(ureq);
 			} else if(event == Event.CANCELLED_EVENT) {
 				cmc.deactivate();
 				cleanUp();
@@ -634,6 +634,8 @@ public class GTAWorkflowEditController extends FormBasicController {
 				} else {
 					chooseAreaButton.setI18nKey("create.areas");
 				}
+				cmc.deactivate();
+				cleanUp();
 				areaListEl.getRootForm().submit(ureq);
 			} else if (event == Event.CANCELLED_EVENT) {
 				cmc.deactivate();