diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
index eac01008e8..92a8c01f50 100644
--- a/src/wp-admin/css/dashboard.css
+++ b/src/wp-admin/css/dashboard.css
@@ -1010,6 +1010,10 @@ a.rsswidget {
 	word-wrap: break-word;
 }
 
+.dashboard-comment-wrap-no-avatar {
+	word-wrap: break-word;
+}
+
 /* Browser Nag */
 #dashboard_browser_nag a.update-browser-link {
 	font-size: 1.2em;
diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php
index 9533c24dec..944d7555f1 100644
--- a/src/wp-admin/includes/dashboard.php
+++ b/src/wp-admin/includes/dashboard.php
@@ -775,12 +775,20 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 
 		<li id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status( $comment ) ), $comment ); ?>>
 
-			<?php echo get_avatar( $comment, 50, 'mystery' ); ?>
+			<?php
+			$show_avatars       = get_option( 'show_avatars' );
+			$show_avatars_class = 'dashboard-comment-wrap-no-avatar';
+
+			if ( 1 == $show_avatars ) {
+				echo get_avatar( $comment, 50, 'mystery' );
+				$show_avatars_class = 'dashboard-comment-wrap';
+			}
+			?>
 
 			<?php if ( ! $comment->comment_type || 'comment' == $comment->comment_type ) : ?>
 
-			<div class="dashboard-comment-wrap has-row-actions">
-			<p class="comment-meta">
+				<div class="<?php echo $show_avatars_class; ?> has-row-actions">
+				<p class="comment-meta">
 				<?php
 				// Comments might not have a post they relate to, e.g. programmatically created ones.
 				if ( $comment_post_link ) {
@@ -800,9 +808,9 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 					);
 				}
 				?>
-			</p>
+				</p>
 
-				<?php
+			<?php
 			else :
 				switch ( $comment->comment_type ) {
 					case 'pingback':