diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 4b888002b..ee8300da2 100644
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -106,6 +106,15 @@ function get_pending_comments_num( $post_id ) {
 
 // Add avatars to relevant places in admin, or try to
 
+add_action('admin_init', 'floated_admin_avatar_handler');
+function floated_admin_avatar_handler() {
+	global $pagenow;
+	if ( 'edit-comments.php' == $pagenow || 'edit.php' == $pagenow ) {
+		if ( get_option('show_avatars') )
+			add_filter( 'comment_author', 'floated_admin_avatar' );
+	}
+}
+
 function floated_admin_avatar( $name ) {
 	global $comment;
 
@@ -121,11 +130,6 @@ function floated_admin_avatar( $name ) {
 	return "$avatar $name";
 }
 
-if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
-	if ( get_option('show_avatars') )
-		add_filter( 'comment_author', 'floated_admin_avatar' );
-}
-
 function wp_get_inbox_items() {
 	$r = array();
 	$r[] = (object) array(