diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
index 21b66c63ad..e683a663a4 100644
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -87,7 +87,7 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
 		<td <?php echo $attributes ?>><strong><?php if ( $is_trash ) echo $att_title; else { ?><a href="<?php echo get_edit_post_link( $post->ID, true ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $att_title; ?></a><?php } ?></strong><br />
 		<?php
 		if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
-			echo wp_specialchars( strtoupper( $matches[1] ) );
+			echo esc_html( strtoupper( $matches[1] ) );
 		else
 			echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
 		?>
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index ab3bacf5dd..53cbca93e8 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -394,7 +394,7 @@ if ( isset($_GET['detached']) ) { ?>
 		<td class="media column-media"><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
 		<?php
 		if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
-			echo wp_specialchars( strtoupper( $matches[1] ) );
+			echo esc_html( strtoupper( $matches[1] ) );
 		else
 			echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );  
 		?>