diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
index 022359225..eebe934ef 100644
--- a/picard/ui/itemviews.py
+++ b/picard/ui/itemviews.py
@@ -525,9 +525,9 @@ class BaseTreeView(QtGui.QTreeWidget):
 
     def activate_item(self, index):
         obj = self.itemFromIndex(index).obj
-        # Double-clicking albums should expand them. The album info can be
+        # Double-clicking albums or clusters should expand them. The album info can be
         # viewed by using the toolbar button.
-        if not isinstance(obj, Album) and obj.can_view_info():
+        if not isinstance(obj, (Album, Cluster)) and obj.can_view_info():
             self.window.view_info()
 
     def add_cluster(self, cluster, parent_item=None):