diff --git a/webapp/components/admin_console/select_team_modal.jsx b/webapp/components/admin_console/select_team_modal.jsx
index 6a1fe9bea7..2ea6cc58cb 100644
--- a/webapp/components/admin_console/select_team_modal.jsx
+++ b/webapp/components/admin_console/select_team_modal.jsx
@@ -14,6 +14,7 @@ export default class SelectTeamModal extends React.Component {
 
         this.doSubmit = this.doSubmit.bind(this);
         this.doCancel = this.doCancel.bind(this);
+        this.compare = this.compare.bind(this);
     }
 
     doSubmit(e) {
@@ -23,15 +24,32 @@ export default class SelectTeamModal extends React.Component {
     doCancel() {
         this.props.onModalDismissed();
     }
+    compare(a, b) {
+        if (a.display_name < b.display_name) {
+            return -1;
+        }
+        if (a.display_name > b.display_name) {
+            return 1;
+        }
+        return 0;
+    }
+
     render() {
         if (this.props.teams == null) {
             return <div/>;
         }
 
-        var options = [];
-        var teams = this.props.teams;
-        Reflect.ownKeys(teams).forEach((key) => {
-            var team = teams[key];
+        const options = [];
+        const teamsArray = [];
+
+        Reflect.ownKeys(this.props.teams).forEach((key) => {
+            teamsArray.push(this.props.teams[key]);
+        });
+
+        teamsArray.sort(this.compare);
+
+        for (let i = 0; i < teamsArray.length; i++) {
+            const team = teamsArray[i];
             options.push(
                 <option
                     key={'opt_' + team.id}
@@ -40,7 +58,7 @@ export default class SelectTeamModal extends React.Component {
                     {team.display_name}
                 </option>
             );
-        });
+        }
 
         return (
             <Modal