diff --git a/static/css/directives/ui/teams-manager.css b/static/css/directives/ui/teams-manager.css
index a36edf5ce..35cd2cfad 100644
--- a/static/css/directives/ui/teams-manager.css
+++ b/static/css/directives/ui/teams-manager.css
@@ -47,6 +47,10 @@
   padding-left: 40px;
 }
 
+.teams-manager .team-member-list .team-member a {
+  text-decoration: none !important;
+}
+
 .teams-manager .team-member-list .team-member-more {
   vertical-align: middle;
   padding-left: 6px;
diff --git a/static/directives/teams-manager.html b/static/directives/teams-manager.html
index 8191b350f..840cf6dc4 100644
--- a/static/directives/teams-manager.html
+++ b/static/directives/teams-manager.html
@@ -35,14 +35,17 @@
 
         <div class="team-member-list" ng-if="members[team.name]">
           <div class="cor-loader" ng-if="!members[team.name].members"></div>
-          <span class="team-member" ng-repeat="member in members[team.name].members | limitTo: 25">
+          <span class="team-member"
+                ng-repeat="member in members[team.name].members | orderBy:'is_robot' | limitTo: 20">
             <span data-title="{{ member.name }}" bs-tooltip>
-              <span class="avatar" data="member.avatar" size="26" ng-if="!member.is_robot"></span>
+              <a href="/user/{{ member.name }}" ng-if="!member.is_robot">
+                <span class="avatar" data="member.avatar" size="26"></span>
+              </a>
               <i class="fa fa-wrench fa-lg" ng-if="member.is_robot"></i>
             </span>
           </span>
           <span class="team-member-more"
-                ng-if="members[team.name].members.length > 25">+ {{ members[team.name].members.length - 25 }} more team members.</span>
+                ng-if="members[team.name].members.length > 20">+ {{ members[team.name].members.length - 20 }} more team members.</span>
           <span class="team-member-more"
                 ng-if="!members[team.name].members.length">(Empty Team)</span>
         </div>
diff --git a/static/js/directives/focusable-popover-content.js b/static/js/directives/focusable-popover-content.js
index 98e8a63e6..24324d19c 100644
--- a/static/js/directives/focusable-popover-content.js
+++ b/static/js/directives/focusable-popover-content.js
@@ -12,7 +12,7 @@ angular.module('quay').directive('focusablePopoverContent', ['$timeout', '$popov
 
         if (!scope) { return; }
         scope.$apply(function() {
-          if (!scope || !$scope.$hide) { return; }
+          if (!scope || !scope.$hide) { return; }
           scope.$hide();
         });
       };