diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
index 1343e5946..bd83f5396 100644
--- a/blockbase/assets/ponyfill.css
+++ b/blockbase/assets/ponyfill.css
@@ -464,6 +464,11 @@ p.has-background {
 	width: 100%;
 }
 
+.wp-block-post-comments .comment-form input:not([type=submit]):not([type=checkbox]),
+.wp-block-post-comments .comment-form textarea {
+	border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
+}
+
 .wp-block-post-comments .comment-reply-title small {
 	float: right;
 	font-size: 14px;
diff --git a/blockbase/sass/blocks/_post-comments.scss b/blockbase/sass/blocks/_post-comments.scss
index 98c9f53f3..529c0c732 100644
--- a/blockbase/sass/blocks/_post-comments.scss
+++ b/blockbase/sass/blocks/_post-comments.scss
@@ -24,6 +24,11 @@
 		input[type="text"] {
 			width: 100%;
 		}
+
+		input:not([type=submit]):not([type=checkbox]),
+		textarea {
+			border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
+		}
 	}
 
 	.comment-reply-title {
diff --git a/skatepark/assets/theme.css b/skatepark/assets/theme.css
index 97c70b905..03ab0b312 100644
--- a/skatepark/assets/theme.css
+++ b/skatepark/assets/theme.css
@@ -146,7 +146,6 @@
 
 .wp-block-post-comments form input:not([type=submit]):not([type=checkbox]),
 .wp-block-post-comments form textarea {
-	border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
 	background: var(--wp--custom--color--background);
 	font-size: var(--wp--preset--font-size--normal);
 	width: 100%;
diff --git a/skatepark/sass/blocks/_post-comments.scss b/skatepark/sass/blocks/_post-comments.scss
index 1ef88b5ab..d164d9ad7 100644
--- a/skatepark/sass/blocks/_post-comments.scss
+++ b/skatepark/sass/blocks/_post-comments.scss
@@ -45,7 +45,6 @@
 
 		input:not([type=submit]):not([type=checkbox]),
 		textarea {
-			border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
 			background: var(--wp--custom--color--background);
 			font-size: var(--wp--preset--font-size--normal);
 			width: 100%;