diff --git a/resources/forms.less b/resources/forms.less
index eafed76..8959cce 100644
--- a/resources/forms.less
+++ b/resources/forms.less
@@ -54,6 +54,26 @@ div.editOptions {
 	}
 }
 
+// Essentially revert T182320 (core change)
+// Custom font stacks below should fully address this issue regardless
+.mw-editfont-monospace,
+.mw-editfont-sans-serif,
+.mw-editfont-serif {
+	font-size: inherit;
+}
+
+.mw-editfont-monospace {
+	font-family: @fonts-mono;
+}
+
+.mw-editfont-sans-serif {
+	font-family: @fonts-sans;
+}
+
+.mw-editfont-serif {
+	font-family: @fonts-serif;
+}
+
 /* Extension:TemplateSandbox stuff */
 .mw-templatesandbox-page label {
 	padding: 0;
diff --git a/resources/themes/wikimedia.less b/resources/themes/wikimedia.less
index ddb3f92..5dec1dc 100644
--- a/resources/themes/wikimedia.less
+++ b/resources/themes/wikimedia.less
@@ -32,9 +32,12 @@
 // Flair
 
 // Fonts are chosen for consistent metrics, not necessarily overall prettiness.
-@fonts: 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Lato', 'Liberation Sans', 'Noto Sans', 'Helvetica Neue', 'Helvetica', sans-serif;
-@fonts-secondary: 'Linux Libertine', 'Times New Roman', 'Liberation Serif', 'Nimbus Roman', 'Noto Serif', 'Times', serif;
+@fonts-sans: 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Lato', 'Liberation Sans', 'Noto Sans', 'Helvetica Neue', 'Helvetica', sans-serif;
+@fonts-serif: 'Linux Libertine', 'Times New Roman', 'Liberation Serif', 'Nimbus Roman', 'Noto Serif', 'Times', serif;
 @fonts-mono: 'Menlo', 'Consolas', 'Monaco', 'Noto Mono', 'Nimbus Mono L', monospace;
 
+@fonts: @fonts-sans;
+@fonts-secondary: @fonts-serif;
+
 @border: 0.2em;
 @radius: 0.2em;