diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index b3913fc12cb..8c7630607c7 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -1416,6 +1416,7 @@ class History( object, Dictifiable, UsesAnnotations, HasName ):
                       .options( joinedload("dataset"),
                                 joinedload("dataset.actions"),
                                 joinedload("dataset.actions.role"),
+                                joinedload("tags"),
                                 ))
             self._active_datasets_and_roles = query.all()
         return self._active_datasets_and_roles