diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index 47bf2f82137..7b0519b88b3 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -451,7 +451,10 @@ abstract class BaseTemplate extends QuickTemplate {
 					'class' => 'mw-indicator',
 				],
 				$content
-			) . "\n";
+			) .
+			// Add whitespace between the <div>s because
+			// they get displayed with display: inline-block
+			"\n";
 		}
 		$out .= "</div>\n";
 		return $out;
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index bd1ce678747..5ea70d7bfd5 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -12,7 +12,7 @@
 	 * @param {Object} response Response data
 	 */
 	function parsePreviewRequest( response ) {
-		var newList, $displaytitle, $content, $parent, $list, arrow, $previewHeader, $wikiPreview, $editform;
+		var indicators, newList, $displaytitle, $content, $parent, $list, arrow, $previewHeader, $wikiPreview, $editform;
 
 		$editform = $( '#editform' );
 		$wikiPreview = $( '#wikiPreview' );
@@ -26,23 +26,25 @@
 			) );
 		}
 
-		newList = [];
-		// eslint-disable-next-line no-jquery/no-each-util
-		$.each( response.parse.indicators, function ( name, indicator ) {
-			newList.push(
-				$( '<div>' )
-					.addClass( 'mw-indicator' )
-					.attr( 'id', mw.util.escapeIdForAttribute( 'mw-indicator-' + name ) )
-					.html( indicator )
-					.get( 0 ),
-				// Add a whitespace between the <div>s because
-				// they get displayed with display: inline-block
-				document.createTextNode( '\n' )
-			);
+		// eslint-disable-next-line no-jquery/no-map-util
+		indicators = $.map( response.parse.indicators, function ( indicator, name ) {
+			return $( '<div>' )
+				.addClass( 'mw-indicator' )
+				.attr( 'id', mw.util.escapeIdForAttribute( 'mw-indicator-' + name ) )
+				.html( indicator )
+				.get( 0 );
 		} );
-		if ( newList.length ) {
-			mw.hook( 'wikipage.indicators' ).fire( $( newList ) );
+		if ( indicators.length ) {
+			mw.hook( 'wikipage.indicators' ).fire( $( indicators ) );
 		}
+
+		// Add whitespace between the <div>s because
+		// they get displayed with display: inline-block
+		newList = [];
+		indicators.forEach( function ( indicator ) {
+			newList.push( indicator, document.createTextNode( '\n' ) );
+		} );
+
 		$( '.mw-indicators' ).empty().append( newList );
 
 		if ( response.parse.displaytitle ) {
diff --git a/resources/src/mediawiki.page.ready/ready.js b/resources/src/mediawiki.page.ready/ready.js
index 52e99d99e7b..98587022bef 100644
--- a/resources/src/mediawiki.page.ready/ready.js
+++ b/resources/src/mediawiki.page.ready/ready.js
@@ -59,9 +59,9 @@ $( function () {
 		 *
 		 * @event wikipage_indicators
 		 * @member mw.hook
-		 * @param {jQuery} $content The root element of the indicators
+		 * @param {jQuery} $content jQuery object with the elements of the indicators
 		 */
-		mw.hook( 'wikipage.indicators' ).fire( $( node ) );
+		mw.hook( 'wikipage.indicators' ).fire( $( node.children ) );
 	}
 
 	/**