diff --git a/extension.json b/extension.json
index f211717d03..c9fb3e1097 100644
--- a/extension.json
+++ b/extension.json
@@ -686,7 +686,7 @@
 				"modules/ve-mw/init/ve.init.mw.trackSubscriber.js"
 			],
 			"styles": [
-				"modules/ve-mw/init/styles/ve.init.mw.Target.css"
+				"modules/ve-mw/init/styles/ve.init.mw.Target.less"
 			],
 			"dependencies": [
 				"mediawiki.String",
diff --git a/modules/ve-mw/init/styles/ve.init.mw.Target.css b/modules/ve-mw/init/styles/ve.init.mw.Target.less
similarity index 70%
rename from modules/ve-mw/init/styles/ve.init.mw.Target.css
rename to modules/ve-mw/init/styles/ve.init.mw.Target.less
index 34e0b45b18..4a88d4ecab 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.Target.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.Target.less
@@ -26,21 +26,35 @@
 
 /* Override MediaWiki's styles that make sense in read mode only */
 
-/* Prevent jQuery.makeCollapsible from hiding the rows, even if collapsed by default */
-.client-js .ve-ce-mwTableNode.mw-collapsed:not( .mw-made-collapsible ) tr:not( :first-child ),
-.client-js .ve-ui-diffElement table.mw-collapsed:not( .mw-made-collapsible ) tr:not( :first-child ) {
-	display: table-row;
-}
+// Prevent jQuery.makeCollapsible from hiding things, even if collapsed by default.
+// These selectors must exactly match those in jquery.makeCollapsible.styles.less in MediaWiki.
+@exclude: ~'.mw-made-collapsible';
 
-.client-js .ve-ce-mwTableNode.mw-collapsed:not( .mw-made-collapsible ) > thead + tbody,
-.client-js .ve-ui-diffElement table.mw-collapsed:not( .mw-made-collapsible ) > thead + tbody {
-	display: table-row-group;
-}
+.client-js {
+	.ve-ce-surface,
+	.ve-ui-diffElement {
+		.mw-collapsed:not( @{exclude} ) {
+			> p {
+				display: block;
+			}
 
-/* Prevent jQuery.makeCollapsible from hiding blocks */
-.client-js .ve-ce-surface .mw-collapsed:not( .mw-made-collapsible ) .mw-collapsible-content,
-.client-js .ve-ui-diffElement .mw-collapsed:not( .mw-made-collapsible ) .mw-collapsible-content {
-	display: block;
+			> table {
+				display: table;
+			}
+
+			> thead + tbody {
+				display: table-row-group;
+			}
+
+			tr:not( :first-child ) {
+				display: table-row;
+			}
+
+			.mw-collapsible-content {
+				display: block;
+			}
+		}
+	}
 }
 
 /*