diff --git a/composer.json b/composer.json
index fefaad34..012c626a 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
   },
   "autoload" : {
     "psr-4" : {
-      "biglotteryfund\\" : "lib/"
+      "biglotteryfund\\" : [ "modules/", "lib/" ]
     }
   },
   "config": {
diff --git a/config/app.php b/config/app.php
new file mode 100644
index 00000000..d7feefad
--- /dev/null
+++ b/config/app.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'modules' => [
+        'control-panel' => biglotteryfund\Module::class,
+    ],
+    'bootstrap' => [
+        'control-panel',
+    ],
+];
\ No newline at end of file
diff --git a/modules/control-panel/Module.php b/modules/control-panel/Module.php
new file mode 100644
index 00000000..d34e6d8e
--- /dev/null
+++ b/modules/control-panel/Module.php
@@ -0,0 +1,24 @@
+<?php
+namespace biglotteryfund;
+
+use craft\elements\Entry;
+use craft\events\RegisterElementSortOptionsEvent;
+use yii\base\Event;
+
+class Module extends \yii\base\Module
+{
+    public function init()
+    {
+        parent::init();
+
+        // https://github.com/craftcms/cms/issues/2818
+        // https://docs.craftcms.com/v3/extend/updating-plugins.html#plugin-hooks
+        Event::on(Entry::class, Entry::EVENT_REGISTER_SORT_OPTIONS, function (RegisterElementSortOptionsEvent $event) {
+            $event->sortOptions[] = [
+                'orderBy' => 'typeId',
+                'label' => \Craft::t('app', 'Entry Type'),
+                'attribute' => 'type',
+            ];
+        });
+    }
+}