diff --git a/views/backend/tinymce/modal-field-row.php b/views/backend/tinymce/modal-field-row.php
index a0c9edade..486522fe2 100644
--- a/views/backend/tinymce/modal-field-row.php
+++ b/views/backend/tinymce/modal-field-row.php
@@ -22,7 +22,7 @@
 			<?php echo esc_attr( $field['label'] ); ?>
 		</label>
 	</div>
-	<div class="right <?php echo esc_attr( $condition ); ?>">
+	<div class="right<?php echo ! empty( $condition ) ? ' ' . esc_attr( $condition ) : ''; ?>">
 		<?php
 		require 'modal-field.php';
 		?>
diff --git a/views/backend/tinymce/modal-field.php b/views/backend/tinymce/modal-field.php
index 3b95d88d8..a2ad1862a 100644
--- a/views/backend/tinymce/modal-field.php
+++ b/views/backend/tinymce/modal-field.php
@@ -117,6 +117,7 @@ class="widefat">
 				data-shortcode="<?php echo esc_attr( $field_name ); ?>"
 				placeholder="<?php echo esc_attr( isset( $field['placeholder'] ) ? $field['placeholder'] : '' ); ?>"
 				<?php echo ( array_key_exists( 'display_if', $field ) ? ' data-display-if="' . esc_attr( $field['display_if']['key'] ) . '" data-display-if-value="' . esc_attr( $field['display_if']['value'] ) . '"' : '' ); ?>
+				/>
 		<?php
 		break;
 }