diff --git a/minerva.less/minerva.mixins.less b/minerva.less/minerva.mixins.less
index b7c29d9..cd36518 100644
--- a/minerva.less/minerva.mixins.less
+++ b/minerva.less/minerva.mixins.less
@@ -2,6 +2,15 @@
 @import 'minerva.variables.less';
 @import 'mediawiki.mixins.animation.less';
 
+.editor-textarea() {
+	// stylelint-disable-next-line no-descending-specificity
+	.box-sizing( border-box );
+	width: 100%;
+	// Note if a textarea has a .mw-ui-input class, this may be overridden
+	padding: 10px @contentPadding 10px @contentPadding;
+	resize: none;
+}
+
 // Generic mixin for applying styles to text that accompanies/adds context to workflows
 .secondary-text() {
 	font-size: 0.9em;
diff --git a/resources/skins.minerva.base.reset/reset.less b/resources/skins.minerva.base.reset/reset.less
index a2e32b2..29e3210 100644
--- a/resources/skins.minerva.base.reset/reset.less
+++ b/resources/skins.minerva.base.reset/reset.less
@@ -12,7 +12,7 @@ small, strike, strong, sub, sup, tt,
 b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
-input, textarea, button, select,
+input, button, select,
 audio, video {
 	margin: 0;
 	padding: 0;
diff --git a/resources/skins.minerva.base.styles/common.less b/resources/skins.minerva.base.styles/common.less
index e766ac1..b14cedc 100644
--- a/resources/skins.minerva.base.styles/common.less
+++ b/resources/skins.minerva.base.styles/common.less
@@ -7,14 +7,6 @@
 	.box-sizing( border-box );
 }
 
-textarea {
-	padding: 5px 0 5px 5px;
-	width: 100%;
-	resize: none;
-	// stylelint-disable-next-line no-descending-specificity
-	.box-sizing( border-box );
-}
-
 // We hide the table of contents unless the user is viewing in tablet resolution or higher
 .toc-mobile,
 // Table of contents as provided by parser has no styling, this is a temporary measure until we are able
diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less
index a38bce5..dc5c2b4 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -255,7 +255,6 @@ input.search {
 .overlay .content-header,
 .overlay .panel,
 .page-list.side-list .list-thumb,
-.editor-overlay .wikitext-editor,
 .page-list li,
 .topic-title-list li,
 .site-link-list li,
diff --git a/skinStyles/mediawiki.action.edit.styles/minerva.less b/skinStyles/mediawiki.action.edit.styles/minerva.less
index 03a8048..01dac35 100644
--- a/skinStyles/mediawiki.action.edit.styles/minerva.less
+++ b/skinStyles/mediawiki.action.edit.styles/minerva.less
@@ -2,6 +2,11 @@
 @import '../../minerva.less/minerva.mixins';
 
 .mw-editform {
+
+	textarea {
+		.editor-textarea();
+	}
+
 	.editHelp, .cancelLink {
 		display: none;
 	}
diff --git a/skinStyles/mobile.startup/Overlay.less b/skinStyles/mobile.startup/Overlay.less
index dbbc2ec..0395185 100644
--- a/skinStyles/mobile.startup/Overlay.less
+++ b/skinStyles/mobile.startup/Overlay.less
@@ -4,6 +4,10 @@
 .overlay {
 	padding-top: @headerHeight;
 
+	textarea {
+		.editor-textarea();
+	}
+
 	> ul, button {
 		width: @headerHeight;
 	}