diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
index 139382c5e91..9413f3ff8e6 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -794,7 +794,7 @@ class AdminToolshed(AdminGalaxy):
         for tsr_id in tsr_ids:
             clause_list.append(trans.install_model.ToolShedRepository.table.c.id == tsr_id)
         query = trans.install_model.context.current.query(trans.install_model.ToolShedRepository).filter(or_(*clause_list))
-        return trans.fill_template('admin/tool_shed_repository/initiate_repository_installation.mako',
+        return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
                                         tool_shed_repositories=tool_shed_repositories,
                                         query=query)
 
@@ -946,7 +946,7 @@ class AdminToolshed(AdminGalaxy):
 
                 encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \
                     install_repository_manager.initiate_repository_installation(installation_dict)
-                return trans.fill_template('admin/tool_shed_repository/initiate_repository_installation.mako',
+                return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
                                            encoded_kwd=encoded_kwd,
                                            query=query,
                                            tool_shed_repositories=tool_shed_repositories,
@@ -1262,7 +1262,7 @@ class AdminToolshed(AdminGalaxy):
             clause_list.append(trans.install_model.ToolShedRepository.table.c.id == tsr_id)
         query = trans.install_model.context.current.query(trans.install_model.ToolShedRepository) \
                                            .filter(or_(*clause_list))
-        return trans.fill_template('admin/tool_shed_repository/initiate_repository_installation.mako',
+        return trans.fill_template('admin/tool_shed_repository/monitor_repository_installation.mako',
                                    encoded_kwd=encoded_kwd,
                                    query=query,
                                    tool_shed_repositories=tool_shed_repositories,
diff --git a/templates/admin/tool_shed_repository/initiate_repository_installation.mako b/templates/admin/tool_shed_repository/monitor_repository_installation.mako
similarity index 94%
rename from templates/admin/tool_shed_repository/initiate_repository_installation.mako
rename to templates/admin/tool_shed_repository/monitor_repository_installation.mako
index d54545da4ea..2da9e1e8c76 100644
--- a/templates/admin/tool_shed_repository/initiate_repository_installation.mako
+++ b/templates/admin/tool_shed_repository/monitor_repository_installation.mako
@@ -1,4 +1,5 @@
 <%inherit file="/base.mako"/>
+<%namespace file="/message.mako" import="render_msg" />
 <%namespace file="/admin/tool_shed_repository/common.mako" import="*" />
 
 <%def name="javascripts()">
@@ -10,7 +11,7 @@
 
 <%def name="repository_installation_javascripts()">
     <script type="text/javascript">
-        %if context.get(initiate_repository_installation_ids):
+        %if hasattr(self, "initiate_repository_installation_ids"):
             $(document).ready(function( ){
                 initiate_repository_installation( "${initiate_repository_installation_ids}", "${encoded_kwd}", "${reinstalling}" );
             });
@@ -30,6 +31,10 @@
     </script>
 </%def>
 
+%if hasattr(self, "message"):
+    ${render_msg( message, error )}
+%endif
+
 %if tool_shed_repositories:
     <div class="toolForm">
         <div class="toolFormTitle">Monitor installing tool shed repositories</div>