diff --git a/ghost/admin/app/helpers/event-name.js b/ghost/admin/app/helpers/event-name.js
index d54a6a0ebe..4230950f27 100644
--- a/ghost/admin/app/helpers/event-name.js
+++ b/ghost/admin/app/helpers/event-name.js
@@ -1,9 +1,37 @@
 import {helper} from '@ember/component/helper';
 
 export const AVAILABLE_EVENTS = [
-    {event: 'site.changed', name: 'Site Changed (rebuild)'},
-    {event: 'subscriber.added', name: 'Subscriber Added'},
-    {event: 'subscriber.deleted', name: 'Subscriber Deleted'}
+    // GROUPNAME: Global
+    {event: 'site.changed', name: 'Site changed (rebuild)', group: 'Global'},
+
+    // GROUPNAME: Posts
+    {event: 'post.added', name: 'Post created', group: 'Posts'},
+    {event: 'post.deleted', name: 'Post deleted', group: 'Posts'},
+    {event: 'post.edited', name: 'Post updated', group: 'Posts'},
+    {event: 'post.published', name: 'Post published', group: 'Posts'},
+    {event: 'post.published.edited', name: 'Published post updated', group: 'Posts'},
+    {event: 'post.unpublished', name: 'Post unpublished', group: 'Posts'},
+    {event: 'post.tag.attached', name: 'Tag added to post', group: 'Posts'},
+    {event: 'post.tag.detached', name: 'Tag removed from post', group: 'Posts'},
+
+    // GROUPNAME: Pages
+    {event: 'page.added', name: 'Page created', group: 'Pages'},
+    {event: 'page.deleted', name: 'Page deleted', group: 'Pages'},
+    {event: 'page.edited', name: 'Page udpated', group: 'Pages'},
+    {event: 'page.published', name: 'Page published', group: 'Pages'},
+    {event: 'page.published.edited', name: 'Published page updated', group: 'Pages'},
+    {event: 'page.unpublished', name: 'Page unpublished', group: 'Pages'},
+    {event: 'page.tag.attached', name: 'Tag added to page', group: 'Pages'},
+    {event: 'page.tag.detached', name: 'Tag removed from page', group: 'Pages'},
+
+    // GROUPNAME: Tags
+    {event: 'tag.added', name: 'Tag created', group: 'Tags'},
+    {event: 'tag.edited', name: 'Tag updated', group: 'Tags'},
+    {event: 'tag.deleted', name: 'Tag deleted', group: 'Tags'},
+
+    // GROUPNAME: Subscribers
+    {event: 'subscriber.added', name: 'Subscriber added', group: 'Subscribers'},
+    {event: 'subscriber.deleted', name: 'Subscriber deleted', group: 'Subscribers'}
 ];
 
 export function eventName([event]/*, hash*/) {
diff --git a/ghost/admin/app/templates/components/modal-webhook-form.hbs b/ghost/admin/app/templates/components/modal-webhook-form.hbs
index 97608540e0..7f22525d3f 100644
--- a/ghost/admin/app/templates/components/modal-webhook-form.hbs
+++ b/ghost/admin/app/templates/components/modal-webhook-form.hbs
@@ -31,6 +31,7 @@
                     optionValuePath="event"
                     optionLabelPath="name"
                     optionTargetPath="event"
+                    groupLabelPath="group"
                     class="mt1"
                     includeBlank=true
                     prompt="Select an event"