diff --git a/includes/skins/MinervaTemplate.php b/includes/skins/MinervaTemplate.php
index b5f17eb..15d4749 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -234,6 +234,7 @@ class MinervaTemplate extends BaseTemplate {
 		$internalBanner = $data[ 'internalBanner' ];
 		$preBodyHtml = isset( $data['prebodyhtml'] ) ? $data['prebodyhtml'] : '';
 		$hasHeadingHolder = $internalBanner || $preBodyHtml || isset( $data['page_actions'] );
+		$hasPageActions = !$this->isSpecialPage && !$this->isMainPage;
 
 		// prepare template data
 		$templateData = [
@@ -263,7 +264,8 @@ class MinervaTemplate extends BaseTemplate {
 			'prebodyhtml' => $preBodyHtml,
 			'headinghtml' => isset( $data['headinghtml'] ) ? $data['headinghtml'] : '',
 			'postheadinghtml' => isset( $data['postheadinghtml'] ) ? $data['postheadinghtml'] : '',
-			'pageactionshtml' => $this->isSpecialPage ? '' : $this->getPageActionsHtml( $data ),
+			'haspageactions' => $hasPageActions,
+			'pageactionshtml' => $hasPageActions ? $this->getPageActionsHtml( $data ) : '',
 			'subtitle' => $data['subtitle'],
 			'contenthtml' => $this->getContentHtml( $data ),
 			'secondaryactionshtml' => $this->getSecondaryActionsHtml(),
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index adbc305..67db140 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -28,7 +28,7 @@
 		<main id="content" class="mw-body">
 			{{#hasheadingholder}}
 			{{{prebodyhtml}}}
-			<div class="pre-content heading-holder">
+			<div class="pre-content heading-holder {{^haspageactions}}heading-holder--no-page-actions{{/haspageactions}}">
 				{{{pageactionshtml}}}
 				{{{headinghtml}}}
 				{{{taglinehtml}}}
diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less
index d365cb6..ed5bca2 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -2,10 +2,15 @@
 @import '../../minerva.less/minerva.mixins';
 
 .heading-holder {
+	@pageActionsGutter: 0.5em;
 	@pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
-	padding: @titleSectionSpacingTop 0 (@pageActionsHeight + 0.5em);
+	padding: @titleSectionSpacingTop 0 (@pageActionsHeight + @pageActionsGutter);
 	position: relative;
 
+	&--no-page-actions {
+		padding-bottom: @pageActionsGutter;
+	}
+
 	.tagline {
 		color: @colorGray5;
 		font-size: 0.85em;
diff --git a/resources/skins.minerva.mainPage.styles/common.less b/resources/skins.minerva.mainPage.styles/common.less
index 06406c5..61c9757 100644
--- a/resources/skins.minerva.mainPage.styles/common.less
+++ b/resources/skins.minerva.mainPage.styles/common.less
@@ -6,6 +6,7 @@
 		border: 0;
 	}
 
+	// Can be removed when cache has cleared (T212216)
 	#page-actions,
 	.pre-content {
 		display: none;