diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index ea0aef681b..43593d32ed 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -632,9 +632,6 @@ case 'add-comment' :
 	if ( !$table->has_items() )
 		die('1');
 
-	if ( get_option('show_avatars') )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-
 	$x = new WP_Ajax_Response();
 	foreach ( $table->items as $comment ) {
 		get_comment( $comment );
@@ -727,9 +724,6 @@ case 'replyto-comment' :
 	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
 	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 
-	if ( get_option('show_avatars') && 'single' != $mode )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-
 	$x = new WP_Ajax_Response();
 
 	ob_start();
@@ -770,9 +764,6 @@ case 'edit-comment' :
 	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 	$comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
 
-	if ( get_option('show_avatars') && 'single' != $mode )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-
 	require_once( './includes/default-list-tables.php' );
 	$table = new WP_Comments_Table();
 
diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 185251a0cd..f9b97798fe 100644
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -158,10 +158,4 @@ function enqueue_comment_hotkeys_js() {
 	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
 		wp_enqueue_script( 'jquery-table-hotkeys' );
 }
-
-if ( is_admin() && isset($pagenow) && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
-	if ( get_option('show_avatars') )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-}
-
 ?>
diff --git a/wp-admin/includes/default-list-tables.php b/wp-admin/includes/default-list-tables.php
index 537764a845..4627fd93a7 100644
--- a/wp-admin/includes/default-list-tables.php
+++ b/wp-admin/includes/default-list-tables.php
@@ -1929,6 +1929,13 @@ class WP_Users_Table extends WP_List_Table {
 class WP_Comments_Table extends WP_List_Table {
 
 	function WP_Comments_Table() {
+		global $mode;
+
+		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
+
+		if ( get_option('show_avatars') && 'single' != $mode )
+			add_filter( 'comment_author', 'floated_admin_avatar' );
+
 		parent::WP_List_Table( array(
 			'screen' => 'edit-comments',
 			'plural' => 'comments'
@@ -1941,12 +1948,10 @@ class WP_Comments_Table extends WP_List_Table {
 	}
 
 	function prepare_items() {
-		global $post_id, $comment_status, $mode, $search;
+		global $post_id, $comment_status, $search;
 
 		$post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0;
 
-		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
-
 		$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
 		if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) )
 			$comment_status = 'all';