diff --git a/lib/galaxy/webapps/tool_shed/controllers/repository.py b/lib/galaxy/webapps/tool_shed/controllers/repository.py
index 433eb630a00..9735c61c8fc 100644
--- a/lib/galaxy/webapps/tool_shed/controllers/repository.py
+++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py
@@ -2466,6 +2466,10 @@ class RepositoryController( BaseUIController, ratings_util.ItemRatings ):
                     kwd[ 'message' ] = 'You must be logged in to set email alerts.'
                     kwd[ 'status' ] = 'error'
                     del kwd[ 'operation' ]
+            elif operation == "view_or_manage_repository":
+                return trans.response.send_redirect( web.url_for( controller='repository',
+                                                                  action='view_or_manage_repository',
+                                                                  **kwd ) )
         self.email_alerts_repository_grid.title = "Set email alerts for repository changes"
         return self.email_alerts_repository_grid( trans, **kwd )
 
@@ -2766,9 +2770,8 @@ class RepositoryController( BaseUIController, ratings_util.ItemRatings ):
     @web.expose
     @web.require_login( "set email alerts" )
     def set_email_alerts( self, trans, **kwd ):
-        # Set email alerts for selected repositories
-        # This method is called from multiple grids, so
-        # the caller must be passed.
+        """Set email alerts for selected repositories."""
+        # This method is called from multiple grids, so the caller must be passed.
         caller = kwd[ 'caller' ]
         user = trans.user
         if user:
diff --git a/lib/tool_shed/grids/repository_grids.py b/lib/tool_shed/grids/repository_grids.py
index 117b683f306..625e3f27808 100644
--- a/lib/tool_shed/grids/repository_grids.py
+++ b/lib/tool_shed/grids/repository_grids.py
@@ -304,7 +304,7 @@ class EmailAlertsRepositoryGrid( RepositoryGrid ):
                              visible=False,
                              filterable="advanced" )
     ]
-    operations = []
+    operations = [ grids.GridOperation( "Receive email alerts", allow_multiple=True  ) ]
     global_actions = [
             grids.GridAction( "User preferences", dict( controller='user', action='index', cntrller='repository' ) )
     ]
diff --git a/templates/webapps/tool_shed/user/manage_email_alerts.mako b/templates/webapps/tool_shed/user/manage_email_alerts.mako
index 1125bd23879..ac75e62eafe 100644
--- a/templates/webapps/tool_shed/user/manage_email_alerts.mako
+++ b/templates/webapps/tool_shed/user/manage_email_alerts.mako
@@ -4,7 +4,7 @@
 <br/><br/>
 <ul class="manage-table-actions">
     <li>
-        <a class="action-button"  href="${h.url_for( controller='repository', action='multi_select_email_alerts', cntrller='repository' )}">Manage repository alerts</a>
+        <a class="action-button"  href="${h.url_for( controller='repository', action='multi_select_email_alerts' )}">Manage repository alerts</a>
     </li>
     <li>
         <a class="action-button"  href="${h.url_for( controller='user', action='index', cntrller='repository' )}">User preferences</a>