diff --git a/src/Calendar/Views.tsx b/src/Calendar/Views.tsx
index 7d858f6..aae5a23 100644
--- a/src/Calendar/Views.tsx
+++ b/src/Calendar/Views.tsx
@@ -387,8 +387,13 @@ export class CalendarComponent extends BaseComponent<ICalendarHubProps, Calendar
                             getItems: () => {
                                 return new Promise<WebApiTeam[]>((resolve, reject) => {
                                     Tfs_Core_WebApi.getClient()
-                                        .getTeams(VSS.getWebContext().project.id)
-                                        .then(resolve, reject);
+                                        .getTeams(VSS.getWebContext().project.id, 1000)
+                                        .then(result => {
+                                            result.sort((a, b) => {
+                                                return a.name.toUpperCase().localeCompare(b.name.toUpperCase());
+                                            });
+                                            resolve(result);
+                                        }, reject);
                                 });
                             },
                             getListItem: (item: WebApiTeam) => {
diff --git a/vss-extension.json b/vss-extension.json
index 1d2bf9f..538a6f7 100644
--- a/vss-extension.json
+++ b/vss-extension.json
@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "team-calendar",
     "publisher": "ms-devlabs",
-    "version": "0.5.194",
+    "version": "0.5.197",
     "name": "Team Calendar",
     "description": "Track events important to your team, view and manage days off, quickly see when sprints start and end, and more.",
     "public": true,