diff --git a/awx/main/migrations/0083_v360_add_notificationtemplate_messages.py b/awx/main/migrations/0083_v360_add_notificationtemplate_messages.py
index d0024440c7..51929b95ae 100644
--- a/awx/main/migrations/0083_v360_add_notificationtemplate_messages.py
+++ b/awx/main/migrations/0083_v360_add_notificationtemplate_messages.py
@@ -22,4 +22,14 @@ class Migration(migrations.Migration):
                                             null=True,
                                             blank=True),
         ),
+        migrations.AlterField(
+            model_name='notification',
+            name='notification_type',
+            field=models.CharField(choices=[('email', 'Email'), ('grafana', 'Grafana'), ('hipchat', 'HipChat'), ('irc', 'IRC'), ('mattermost', 'Mattermost'), ('pagerduty', 'Pagerduty'), ('rocketchat', 'Rocket.Chat'), ('slack', 'Slack'), ('twilio', 'Twilio'), ('webhook', 'Webhook')], max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='notificationtemplate',
+            name='notification_type',
+            field=models.CharField(choices=[('email', 'Email'), ('grafana', 'Grafana'), ('hipchat', 'HipChat'), ('irc', 'IRC'), ('mattermost', 'Mattermost'), ('pagerduty', 'Pagerduty'), ('rocketchat', 'Rocket.Chat'), ('slack', 'Slack'), ('twilio', 'Twilio'), ('webhook', 'Webhook')], max_length=32),
+        ),
     ]
diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py
index f916c8f31f..10f1a40484 100644
--- a/awx/main/models/notifications.py
+++ b/awx/main/models/notifications.py
@@ -45,7 +45,7 @@ class NotificationTemplate(CommonModelNameNotUnique):
                           ('mattermost', _('Mattermost'), MattermostBackend),
                           ('rocketchat', _('Rocket.Chat'), RocketChatBackend),
                           ('irc', _('IRC'), IrcBackend)]
-    NOTIFICATION_TYPE_CHOICES = [(x[0], x[1]) for x in NOTIFICATION_TYPES]
+    NOTIFICATION_TYPE_CHOICES = sorted([(x[0], x[1]) for x in NOTIFICATION_TYPES])
     CLASS_FOR_NOTIFICATION_TYPE = dict([(x[0], x[2]) for x in NOTIFICATION_TYPES])
 
     class Meta: