diff --git a/remote/assets/styles/wpcom-theme-compat.css b/remote/assets/styles/wpcom-theme-compat.css
new file mode 100644
index 0000000000..8855e5bc1f
--- /dev/null
+++ b/remote/assets/styles/wpcom-theme-compat.css
@@ -0,0 +1,3 @@
+.highlander-enabled .wp-block-post-comments .comment-form  {
+    display: revert;
+}
\ No newline at end of file
diff --git a/remote/functions.php b/remote/functions.php
index e8012d3e14..5d84e8765c 100644
--- a/remote/functions.php
+++ b/remote/functions.php
@@ -164,5 +164,15 @@ function remote_preload_webfonts() {
  */
 require get_template_directory() . '/inc/block-patterns.php';
 
-
-
+function wpcom_load_theme_compat_styles() {
+	$version     = wp_get_theme( get_template() )->get( 'Version' );
+	$styles_path = get_template_directory_uri() . '/assets/styles/wpcom-theme-compat.css';
+
+	wp_enqueue_style( 'remote_compat_css', $styles_path, array(), $version );
+
+	// Enqueue editor styles.
+	add_editor_style(
+		array( $styles_path )
+	);
+}
+add_action( 'after_setup_theme', 'wpcom_load_theme_compat_styles' );
diff --git a/remote/style.css b/remote/style.css
index 8ced42d97f..45650717b5 100644
--- a/remote/style.css
+++ b/remote/style.css
@@ -211,7 +211,7 @@ a {
 	 border: 1px solid var(--wp--preset--color--foreground);
  }
 
- .wp-block-post-comments .comment-form:not( .highlander-enabled .wp-block-post-comments .comment-form ) {
+ .wp-block-post-comments .comment-form {
 	display: grid;
 	grid-template-columns: 1fr 1fr;
 	column-gap: var(--wp--custom--spacing--small);