diff --git a/app/assets/javascripts/discourse/templates/components/group-form.hbs b/app/assets/javascripts/discourse/templates/components/group-form.hbs
index c6c82911bc5..d8a6570af10 100644
--- a/app/assets/javascripts/discourse/templates/components/group-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-form.hbs
@@ -184,8 +184,6 @@
         class='btn btn-primary'
         label=saveLabel}}
 
-    {{#link-to "groups"}}
-      {{i18n 'cancel'}}
-    {{/link-to}}
+    {{yield}}
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/templates/groups/new.hbs
index b947fe1c12b..629cb728548 100644
--- a/app/assets/javascripts/discourse/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/new.hbs
@@ -1,7 +1,12 @@
 {{#d-section pageClass="groups-new"}}
   <h1>{{i18n "groups.new.title"}}</h1>
 
-  {{group-form model=model
+  {{#group-form model=model
       saveLabel="groups.new.create"
       save="save"}}
+
+      {{#link-to "groups"}}
+        {{i18n 'cancel'}}
+      {{/link-to}}
+  {{/group-form}}
 {{/d-section}}