diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss
index 142f05e4..9479ca97 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss
@@ -1,5 +1,5 @@
 <div id="pages-controller-cms-content" class="has-panel cms-content flexbox-area-grow fill-height $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content" data-ignore-tab-state="true">
-	<div class="fill-width flexbox-area-grow">
+	<div class="fill-width fill-height flexbox-area-grow">
 		$Tools
 
 		<div class="fill-height flexbox-area-grow">
@@ -29,7 +29,7 @@
 				</div>
 			</div>
 
-			<div class="flexbox-area-grow fill-width">
+			<div class="flexbox-area-grow fill-height fill-width">
 				$EditForm
 			</div>
 		</div>