diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
index 53c0673e8f..eb8147fd7e 100644
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -7,7 +7,8 @@
  */
 
 if ( ! defined('ABSPATH') ) die();
-?>
+
+if ( have_posts() ) { ?>
 <table class="widefat fixed" cellspacing="0">
 	<thead>
 	<tr>
@@ -23,7 +24,6 @@ if ( ! defined('ABSPATH') ) die();
 	
 	<tbody id="the-list" class="list:post">
 <?php
-if ( have_posts() ) {
 add_filter('the_title','wp_specialchars');
 $alt = '';
 $posts_columns = get_column_headers('upload');
@@ -195,15 +195,14 @@ foreach ($posts_columns as $column_name => $column_display_name ) {
 }
 ?>
 	</tr>
-<?php
-endwhile;
-} else {
-?>
-  <tr>
-    <td colspan="8"><?php _e('No posts found.') ?></td>
-  </tr>
+<?php endwhile; ?>
+	</tbody>
+</table>
+<?php } else { ?>
+
+<p><?php _e('No posts found.') ?></p>
+
 <?php
 } // end if ( have_posts() )
 ?>
-	</tbody>
-</table>
+