diff --git a/code/controllers/CMSSettingsController.php b/code/controllers/CMSSettingsController.php
index b24547c7..29bd75c9 100644
--- a/code/controllers/CMSSettingsController.php
+++ b/code/controllers/CMSSettingsController.php
@@ -5,6 +5,15 @@ class CMSSettingsController extends LeftAndMain {
 	static $url_rule = '/$Action/$ID/$OtherID';
 	static $menu_priority = -1;
 	static $menu_title = 'Settings';
+
+	public function getResponseNegotiator() {
+		$neg = parent::getResponseNegotiator();
+		$controller = $this;
+		$neg->setCallback('CurrentForm', function() use(&$controller) {
+			return $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
+		});
+		return $neg;
+	}
 	
 		/**
 	 * @return Form
@@ -16,8 +25,8 @@ class CMSSettingsController extends LeftAndMain {
 		$actions = $siteConfig->getCMSActions();
 		$form = new Form($this, 'EditForm', $fields, $actions);
 		$form->addExtraClass('root-form');
-
 		$form->addExtraClass('cms-edit-form cms-panel-padded center');
+		// don't add data-pjax-fragment=CurrentForm, its added in the content template instead
 
 		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
 		$form->setHTMLID('Form_EditForm');
@@ -47,8 +56,7 @@ class CMSSettingsController extends LeftAndMain {
 		$siteConfig->write();
 		
 		$this->response->addHeader('X-Status', rawurlencode(_t('LeftAndMain.SAVEDUP', 'Saved.')));
-	
-		return $form->forTemplate();
+		return $this->getResponseNegotiator()->respond($this->request);
 	}
 	
 	function LinkPreview() {
diff --git a/templates/Includes/CMSSettingsController_Content.ss b/templates/Includes/CMSSettingsController_Content.ss
index 6561f0ec..b56ee115 100644
--- a/templates/Includes/CMSSettingsController_Content.ss
+++ b/templates/Includes/CMSSettingsController_Content.ss
@@ -1,4 +1,4 @@
-<div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
+<div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm">
 
 	<div class="cms-content-header north">
 		<% with EditForm %>