diff --git a/resources/skins.minerva.base.styles/common.less b/resources/skins.minerva.base.styles/common.less
index a47ce7f..b7cda89 100644
--- a/resources/skins.minerva.base.styles/common.less
+++ b/resources/skins.minerva.base.styles/common.less
@@ -46,6 +46,8 @@ 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
diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less
index 2b372ff..1fbcec7 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -444,7 +444,7 @@ input.search {
 .image-list,
 .pre-content,
 // Form only pages e.g Special:MobileOptions
-#mw-content-text > form .oo-ui-fieldLayout-body,
+#mw-content-text > form > .oo-ui-fieldLayout > .oo-ui-fieldLayout-body,
 // Save button on Special:MobileOptions
 #mw-content-text > form > .oo-ui-widget,
 .content,
diff --git a/skinStyles/mediawiki.action.edit.styles/minerva.less b/skinStyles/mediawiki.action.edit.styles/minerva.less
index cfd634d..a7366fe 100644
--- a/skinStyles/mediawiki.action.edit.styles/minerva.less
+++ b/skinStyles/mediawiki.action.edit.styles/minerva.less
@@ -1,20 +1,15 @@
 // Additional Styles for no-js editing mode
 @import 'minerva.mixins';
 
-#wpTextbox1 {
-	border: 1px solid @colorGray12;
-}
+.mw-editform {
+	.editHelp, .cancelLink {
+		display: none;
+	}
 
-.editHelp, .cancelLink {
-	display: none;
-}
-
-.editButtons input, .editButtons a {
-	margin-top: 10px;
-}
-
-textarea.mw-ui-input {
-	max-height: 14em;
+	> #wpTextbox1 {
+		border: 1px solid @colorGray12;
+		max-height: 70vh;
+	}
 }
 
 .action-submit,
@@ -30,12 +25,11 @@ textarea.mw-ui-input {
 		font-weight: bold;
 	}
 
-	.editCheckboxes {
-		margin-top: 8px;
-	}
-
 	#mw-anon-edit-warning {
 		padding: 8px;
+		> p {
+			margin: 0;
+		}
 	}
 
 	// Parsing information doesn't need to be so big