diff --git a/resources/skins.minerva.content.styles/templates/ambox.less b/resources/skins.minerva.content.styles/templates/ambox.less
index 0b670b1..79902b1 100644
--- a/resources/skins.minerva.content.styles/templates/ambox.less
+++ b/resources/skins.minerva.content.styles/templates/ambox.less
@@ -39,7 +39,10 @@ table.ambox {
 
 	// Assuming that most ambox templates wrap content in this element.
 	// See https://en.wikipedia.org/w/index.php?title=Module:Message_box&action=raw (search for 'mbox-text-span').
+	// https://phabricator.wikimedia.org/T206887 suggests .mbox-text-div is also needed.
+	.mbox-text-div,
 	.mbox-text-span {
+		display: inline-block;
 		max-height: @contentLineHeight * 2em;
 		// All will have this height (approx 2 lines) even if a single line e.g. {{dictdef}} when on mobile.
 		// Overriden later in tablet styles.
diff --git a/resources/skins.minerva.scripts/pageIssues.js b/resources/skins.minerva.scripts/pageIssues.js
index 63128b7..f09ce13 100644
--- a/resources/skins.minerva.scripts/pageIssues.js
+++ b/resources/skins.minerva.scripts/pageIssues.js
@@ -86,7 +86,7 @@
 				.text( mw.msg( 'skin-minerva-issue-learn-more' ) );
 			if ( $( '.mw-collapsible-content' ).length ) {
 				// e.g. Template:Multiple issues
-				$learnMore.insertAfter( $metadata.find( '.mbox-text-span' ) );
+				$learnMore.insertAfter( $metadata.find( '.mbox-text-span, .mbox-text-div' ) );
 			} else {
 				// e.g. Template:merge from
 				$learnMore.appendTo( $metadata.find( '.mbox-text' ) );