diff --git a/static/js/controllers.js b/static/js/controllers.js
index 146c93b69..f66f052dc 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -357,11 +357,6 @@ function RepoCtrl($scope, Restangular, ApiService, $routeParams, $rootScope, $lo
 }
 
 function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope) {
-  $('.info-icon').popover({
-    'trigger': 'hover',
-    'html': true
-  });
-
   var namespace = $routeParams.namespace;
   var name = $routeParams.name;
 
@@ -610,6 +605,11 @@ function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
       fetchPermissions('team');
       fetchTokens();
 
+      $('.info-icon').popover({
+        'trigger': 'hover',
+        'html': true
+      });
+
       return $scope.repo;
     });
   };
@@ -1196,11 +1196,6 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
 }
 
 function TeamViewCtrl($rootScope, $scope, Restangular, ApiService, $routeParams) {
-  $('.info-icon').popover({
-    'trigger': 'hover',
-    'html': true
-  });
-
   var teamname = $routeParams.teamname;
   var orgname = $routeParams.orgname;
 
@@ -1274,8 +1269,14 @@ function TeamViewCtrl($rootScope, $scope, Restangular, ApiService, $routeParams)
     $scope.membersResource = ApiService.getOrganizationTeamMembersAsResource(params).get(function(resp) {
       $scope.members = resp.members;
       $scope.canEditMembers = resp.can_edit;
+        
+      $('.info-icon').popover({
+        'trigger': 'hover',
+        'html': true
+      });
+
       return resp.members;
-    });   
+    });
   };
 
   // Load the organization.