diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index e8f095e6343..629a47f16dd 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -120,7 +120,7 @@ class HistoryListGrid(grids.Grid):
         grids.GridColumnFilter("All", args=dict(deleted='All')),
     ]
     default_filter = dict(name="All", deleted="False", tags="All", sharing="All")
-    num_rows_per_page = 10
+    num_rows_per_page = 15
     preserve_state = False
     use_async = True
     use_paging = True
diff --git a/templates/tagging_common.mako b/templates/tagging_common.mako
index ece9d40a0d6..8f7b66bc523 100644
--- a/templates/tagging_common.mako
+++ b/templates/tagging_common.mako
@@ -132,7 +132,14 @@
     %>
 
     ## Build HTML.
-    ${self.render_tagging_element_html(elt_id=elt_id, tags=item_tags, editable=editable, use_toggle_link=use_toggle_link, input_size=input_size, in_form=in_form, render_add_tag_button=render_add_tag_button)}
+    <%
+    if len(item_tags) > 3:
+        # If item has more than 3 tags show a link to see tags instead of displaying them all
+        use_toggle_link = True
+    else:
+        use_toggle_link = False
+    %>
+    ${self.render_tagging_element_html(elt_id=elt_id, tags=item_tags, editable=editable, use_toggle_link=use_toggle_link,  input_size=input_size, in_form=in_form, render_add_tag_button=render_add_tag_button)}
 
     ## Build script that augments tags using progressive javascript.
     <script type="text/javascript">