diff --git a/templates/webapps/tool_shed/common/repository_actions_menu.mako b/templates/webapps/tool_shed/common/repository_actions_menu.mako
index 9a73ac8140e..5b83bd530a0 100644
--- a/templates/webapps/tool_shed/common/repository_actions_menu.mako
+++ b/templates/webapps/tool_shed/common/repository_actions_menu.mako
@@ -54,7 +54,7 @@
         else:
             can_push = False
 
-        if not is_deprecated and not is_new and not is_malicious:
+        if not is_deprecated and not is_new and not changeset_is_malicious:
             can_download = True
         else:
             can_download = False
diff --git a/templates/webapps/tool_shed/repository/browse_repository.mako b/templates/webapps/tool_shed/repository/browse_repository.mako
index 0875946defd..32409fc4108 100644
--- a/templates/webapps/tool_shed/repository/browse_repository.mako
+++ b/templates/webapps/tool_shed/repository/browse_repository.mako
@@ -31,7 +31,7 @@
     can_browse_contents = not is_new
 %>
 
-${render_tool_shed_repository_actions( repository, changeset_revision=changeset_revision )}
+${render_tool_shed_repository_actions( repository, metadata=metadata, changeset_revision=changeset_revision )}
 
 %if message:
     ${render_msg( message, status )}
diff --git a/templates/webapps/tool_shed/repository/contact_owner.mako b/templates/webapps/tool_shed/repository/contact_owner.mako
index 4dc3b2e6d23..3b2d5b8a50b 100644
--- a/templates/webapps/tool_shed/repository/contact_owner.mako
+++ b/templates/webapps/tool_shed/repository/contact_owner.mako
@@ -11,7 +11,7 @@
 %>
 <%inherit file="${inherit(context)}"/>
 
-${render_tool_shed_repository_actions( repository )}
+${render_tool_shed_repository_actions( repository, metadata=metadata )}
 
 %if message:
     ${render_msg( message, status )}
diff --git a/templates/webapps/tool_shed/repository/export_repository.mako b/templates/webapps/tool_shed/repository/export_repository.mako
index 0bf2a996757..04f9d0fa4d9 100644
--- a/templates/webapps/tool_shed/repository/export_repository.mako
+++ b/templates/webapps/tool_shed/repository/export_repository.mako
@@ -23,7 +23,7 @@
     ${container_javascripts()}
 </%def>
 
-${render_tool_shed_repository_actions( repository, changeset_revision=changeset_revision )}
+${render_tool_shed_repository_actions( repository, metadata=metadata, changeset_revision=changeset_revision )}
 
 %if message:
     ${render_msg( message, status )}
diff --git a/templates/webapps/tool_shed/repository/view_changelog.mako b/templates/webapps/tool_shed/repository/view_changelog.mako
index b97fc79e8a7..f40de93a811 100644
--- a/templates/webapps/tool_shed/repository/view_changelog.mako
+++ b/templates/webapps/tool_shed/repository/view_changelog.mako
@@ -29,7 +29,7 @@
     ${h.js( "libs/jquery/jquery.rating" )}
 </%def>
 
-${render_tool_shed_repository_actions( repository=repository )}
+${render_tool_shed_repository_actions( repository=repository, metadata=metadata )}
 
 %if message:
     ${render_msg( message, status )}
diff --git a/templates/webapps/tool_shed/repository/view_changeset.mako b/templates/webapps/tool_shed/repository/view_changeset.mako
index 8a2e18d81d9..837bc733873 100644
--- a/templates/webapps/tool_shed/repository/view_changeset.mako
+++ b/templates/webapps/tool_shed/repository/view_changeset.mako
@@ -29,7 +29,7 @@
     ${h.js( "libs/jquery/jquery.rating" )}
 </%def>
 
-${render_tool_shed_repository_actions( repository=repository )}
+${render_tool_shed_repository_actions( repository=repository, metadata=metadata )}
 
 %if message:
     ${render_msg( message, status )}
diff --git a/templates/webapps/tool_shed/repository/view_repository.mako b/templates/webapps/tool_shed/repository/view_repository.mako
index 4886509178b..ef9cc0fda34 100644
--- a/templates/webapps/tool_shed/repository/view_repository.mako
+++ b/templates/webapps/tool_shed/repository/view_repository.mako
@@ -61,7 +61,7 @@
 </%def>
 
 %if trans.webapp.name == 'tool_shed':
-    ${render_tool_shed_repository_actions( repository=repository, changeset_revision=changeset_revision )}
+    ${render_tool_shed_repository_actions( repository=repository, metadata=metadata, changeset_revision=changeset_revision )}
 %else:
     ${render_galaxy_repository_actions( repository=repository )}
 %endif
diff --git a/templates/webapps/tool_shed/repository/view_tool_metadata.mako b/templates/webapps/tool_shed/repository/view_tool_metadata.mako
index ce7c3b88eb0..a84993a49c6 100644
--- a/templates/webapps/tool_shed/repository/view_tool_metadata.mako
+++ b/templates/webapps/tool_shed/repository/view_tool_metadata.mako
@@ -22,7 +22,7 @@
 <%inherit file="${inherit(context)}"/>
 
 %if render_repository_actions_for == 'tool_shed':
-    ${render_tool_shed_repository_actions( repository=repository, changeset_revision=changeset_revision )}
+    ${render_tool_shed_repository_actions( repository=repository, metadata=metadata, changeset_revision=changeset_revision )}
 %else:
     ${render_galaxy_repository_actions( repository=repository )}
 %endif