diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py
index 9c7c1e5424e..e9cfe968fa6 100644
--- a/lib/galaxy/webapps/galaxy/controllers/visualization.py
+++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py
@@ -72,7 +72,8 @@ class HistoryDatasetsSelectionGrid(grids.Grid):
     def apply_query_filter(self, trans, query, **kwargs):
         if self.available_tracks is None:
             self.available_tracks = trans.app.datatypes_registry.get_available_tracks()
-        return query.filter(model.HistoryDatasetAssociation.extension.in_(self.available_tracks)) \
+        return query.filter(model.History.user == trans.user) \
+                    .filter(model.HistoryDatasetAssociation.extension.in_(self.available_tracks)) \
                     .filter(model.Dataset.state == model.Dataset.states.OK) \
                     .filter(model.HistoryDatasetAssociation.deleted == false()) \
                     .filter(model.HistoryDatasetAssociation.visible == true())
@@ -100,7 +101,8 @@ class LibraryDatasetsSelectionGrid(grids.Grid):
     def apply_query_filter(self, trans, query, **kwargs):
         if self.available_tracks is None:
             self.available_tracks = trans.app.datatypes_registry.get_available_tracks()
-        return query.filter(model.LibraryDatasetDatasetAssociation.extension.in_(self.available_tracks)) \
+        return query.filter(model.LibraryDatasetDatasetAssociation.user == trans.user) \
+                    .filter(model.LibraryDatasetDatasetAssociation.extension.in_(self.available_tracks)) \
                     .filter(model.Dataset.state == model.Dataset.states.OK) \
                     .filter(model.LibraryDatasetDatasetAssociation.deleted == false()) \
                     .filter(model.LibraryDatasetDatasetAssociation.visible == true())