diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 5e2ea6450e..898afc34c9 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -355,19 +355,22 @@ do_action('after-' . $taxonomy . '-table', $taxonomy);
cap->edit_terms ) )
- $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) );
-else
- $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
-if ( $tag_cloud && !is_taxonomy_hierarchical($taxonomy) ) :
-?>
+if ( !is_taxonomy_hierarchical($taxonomy) ) {
+ if ( current_user_can( $tax->cap->edit_terms ) )
+ $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) );
+ else
+ $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
+
+ if ( $tag_cloud ) :
+ ?>
labels->popular_items; ?>
cap->edit_terms) ) {
if ( 'category' == $taxonomy )