diff --git a/includes/templates/skin.mustache b/includes/templates/skin.mustache
index dba0515f..f3d3a0a2 100644
--- a/includes/templates/skin.mustache
+++ b/includes/templates/skin.mustache
@@ -65,9 +65,8 @@
 		{{>ArticleToolbar}}
 	{{/is-title-above-tabs}}
 
-	{{>ContentSubheader}}
-
-	<div id="bodyContent" class="vector-body">
+	<div id="bodyContent" class="vector-body" {{#is-title-above-tabs}} data-mw-ve-target-container {{/is-title-above-tabs}}>
+		{{>ContentSubheader}}
 		<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
 		<div id="contentSub2">{{{html-undelete-link}}}</div>
 		{{{html-user-message}}}