diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 4bc9460d2..c49b663d3 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1132,6 +1132,10 @@ function wp_richedit_pre($text) {
 	$output = str_replace('<', '<', $output);
 	$output = str_replace('>', '>', $output);
 
+	// These should be entities too
+	$output = str_replace('<', '&lt;', $output);
+	$output = str_replace('>', '&gt;', $output);
+	
 	return apply_filters('richedit_pre', $output);
 }