diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
index 307d63b2dc..21b66c63ad 100644
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -85,7 +85,12 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
 	case 'media':
 		?>
 		<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 echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
+		<?php
+		if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+			echo wp_specialchars( strtoupper( $matches[1] ) );
+		else
+			echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
+		?>
 		<p>
 		<?php
 		$actions = array();
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index eaa9b7cbe3..ab3bacf5dd 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -392,7 +392,12 @@ if ( isset($_GET['detached']) ) { ?>
 <?php	} ?></td>
 
 		<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 echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
+		<?php
+		if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
+			echo wp_specialchars( strtoupper( $matches[1] ) );
+		else
+			echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );  
+		?>
 
 		<div class="row-actions">
 		<?php