diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py
index d2dd42fa8d..ce8a9f9e61 100644
--- a/src/calibre/gui2/tag_browser/view.py
+++ b/src/calibre/gui2/tag_browser/view.py
@@ -93,11 +93,8 @@ class TagDelegate(QStyledItemDelegate):  # {{{
             r = style.subElementRect(style.SE_ItemViewItemFocusRect, option,
                     widget)
             painter.drawLine(r.bottomLeft(), r.bottomRight())
-        if item.type != TagTreeItem.TAG:
-            return
-        if item.tag.state == 0:
-            if config['show_avg_rating']:
-                self.draw_average_rating(item, style, painter, option, widget)
+        if item.type == TagTreeItem.TAG and item.tag.state == 0 and config['show_avg_rating']:
+            self.draw_average_rating(item, style, painter, option, widget)
 
     # }}}