diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index b40311f5..175ae86e 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -2214,7 +2214,9 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 		$existsOnLive = $this->isPublished();
 
 		// Major actions appear as buttons immediately visible as page actions.
-		$majorActions = CompositeField::create()->setName('MajorActions')->setTag('fieldset')->addExtraClass('btn-group ss-ui-buttonset noborder');
+		$majorActions = CompositeField::create()
+			->setName('MajorActions');
+		$majorActions->setFieldHolderTemplate(get_class($majorActions) . '_holder_buttongroup');
 
 		// Minor options are hidden behind a drop-up and appear as links (although they are still FormActions).
 		$rootTabSet = new TabSet('ActionMenus');
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
index 5afe0d65..60a8c426 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss
@@ -20,7 +20,7 @@
 		<% if $Actions %>
 		<div class="btn-toolbar">
 			<% loop $Actions %>
-				$Field
+				$FieldHolder
 			<% end_loop %>
 				<% if $Controller.LinkPreview %>
 			<a href="$Controller.LinkPreview" target="_cmsPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">