diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index f9d038cc..88568e84 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -647,6 +647,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 				$form->setFields($readonlyFields);
 			}
 
+			$form->Fields()->setForm($form);
+
 			$this->extend('updateEditForm', $form);
 			return $form;
 		} else if($id) {