diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
index 1abb85ece74..9e817c088af 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -786,9 +786,10 @@ class AdminToolshed(AdminGalaxy):
         tsr_ids = common_util.get_tool_shed_repository_ids(**kwd)
         if not tsr_ids:
             tsr_ids = repository_util.get_ids_of_tool_shed_repositories_being_installed(trans.app, as_string=False)
+        tsr_ids = [trans.security.decode_id(tsr_id) for tsr_id in tsr_ids]
         tool_shed_repositories = []
         for tsr_id in tsr_ids:
-            tsr = trans.install_model.context.query(trans.install_model.ToolShedRepository).get(trans.security.decode_id(tsr_id))
+            tsr = trans.install_model.context.query(trans.install_model.ToolShedRepository).get(tsr_id)
             tool_shed_repositories.append(tsr)
         clause_list = []
         for tsr_id in tsr_ids:
diff --git a/templates/admin/tool_shed_repository/monitor_repository_installation.mako b/templates/admin/tool_shed_repository/monitor_repository_installation.mako
index 8bad0ba2425..26930499389 100644
--- a/templates/admin/tool_shed_repository/monitor_repository_installation.mako
+++ b/templates/admin/tool_shed_repository/monitor_repository_installation.mako
@@ -75,4 +75,6 @@
             <br clear="left"/>
         </div>
     </div>
+%else:
+    ${render_msg("There is no repository is being installed.", "info")}
 %endif