diff --git a/static/directives/entity-search.html b/static/directives/entity-search.html
index 9e8742408..8928143ed 100644
--- a/static/directives/entity-search.html
+++ b/static/directives/entity-search.html
@@ -52,7 +52,7 @@
 
       <li role="presentation" class="dropdown-header" ng-show="!lazyLoading && teams">Teams</li>
 
-      <li class="menuitem" role="presentation" ng-repeat="team in teams" ng-show="!lazyLoading"
+      <li class="menuitem" role="presentation" ng-repeat="team in teams | orderBy: 'name'" ng-show="!lazyLoading"
           ng-click="setEntity(team.name, 'team', false, team.avatar)">
         <a role="menuitem" tabindex="-1" href="javascript:void(0)">
           <span ng-if="!Config.isNewLayout()">
@@ -68,7 +68,7 @@
 
       <li role="presentation" class="dropdown-header" ng-show="!lazyLoading && robots">Robot Accounts</li>
 
-      <li class="menuitem" role="presentation" ng-repeat="robot in robots | orderBy:name" ng-show="!lazyLoading">
+      <li class="menuitem" role="presentation" ng-repeat="robot in robots | orderBy:'name'" ng-show="!lazyLoading">
         <a role="menuitem" tabindex="-1" href="javascript:void(0)" ng-click="setEntity(robot.name, 'user', true)">
           <i class="fa fa-wrench"></i> <span>{{ robot.name }}</span>
         </a>
diff --git a/static/js/directives/ui/entity-search.js b/static/js/directives/ui/entity-search.js
index 38a68bb1e..c9195094b 100644
--- a/static/js/directives/ui/entity-search.js
+++ b/static/js/directives/ui/entity-search.js
@@ -94,7 +94,7 @@ angular.module('quay').directive('entitySearch', function () {
       $scope.createTeam = function() {
         CreateService.askCreateTeam($scope.namespace, function(created) {
           $scope.setEntity(created.name, 'team', false, created.avatar);
-          $scope.teams[teamname] = created;
+          $scope.teams[created.name] = created;
         });
       };
 
diff --git a/static/js/services/create-service.js b/static/js/services/create-service.js
index b6092728b..d52d3cf92 100644
--- a/static/js/services/create-service.js
+++ b/static/js/services/create-service.js
@@ -53,7 +53,7 @@ angular.module('quay').factory('CreateService', ['ApiService', 'UserService', fu
         return;
       }
 
-      CreateService.createOrganizationTeam(ApiService, namespace, teamname,  callback);
+      createService.createOrganizationTeam(ApiService, namespace, teamname,  callback);
     });
   };