diff --git a/code/CMSMain.php b/code/CMSMain.php
index 61b9d26c..60c704b2 100644
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -421,7 +421,10 @@ JS;
 			$form->loadDataFrom($record);
 			$form->disableDefaultAction();
 
-			if(!$record->canEdit() || $record->DeletedFromStage) $form->makeReadonly();
+			if(!$record->canEdit() || $record->DeletedFromStage) {
+				$readonlyFields = $form->Fields()->makeReadonly();
+				$form->setFields($readonlyFields);
+			}
 
 			return $form;
 		} else if($id) {