diff --git a/.gitmodules b/.gitmodules
index ad2840f..e521313 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "wagtail-localize"]
 	path = wagtail-localize
 	url = https://github.com/wagtail/wagtail-localize.git
+[submodule "wagtail-shell"]
+	path = wagtail-shell
+	url = https://github.com/kaedroho/wagtail-shell.git
diff --git a/bakerydemo/settings/base.py b/bakerydemo/settings/base.py
index 048d1b1..2b59eed 100644
--- a/bakerydemo/settings/base.py
+++ b/bakerydemo/settings/base.py
@@ -38,7 +38,7 @@ INSTALLED_APPS = [
     'bakerydemo.search',
 
     'wagtail_localize',
-    'wagtail.shell',
+    'wagtail_shell',
 
     'wagtail.contrib.search_promotions',
     'wagtail.contrib.forms',
@@ -84,7 +84,7 @@ MIDDLEWARE = [
 
     'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 
-    'wagtail.shell.middleware.WagtailShellMiddleware',
+    'wagtail_shell.middleware.WagtailShellMiddleware',
 ]
 
 ROOT_URLCONF = 'bakerydemo.urls'
diff --git a/requirements/base.txt b/requirements/base.txt
index 5f28aa5..deb292f 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,6 +1,7 @@
 Django>=3.1,<3.2
 django-dotenv==1.4.1
 -e ./wagtail[testing]
+-e ./wagtail-shell[testing]
 -e ./wagtail-localize[testing]
 wagtailfontawesome>=1.1.3,<1.2
 Pillow>=6.2.0,<6.3
diff --git a/wagtail b/wagtail
index 1c1b155..a8b5b59 160000
--- a/wagtail
+++ b/wagtail
@@ -1 +1 @@
-Subproject commit 1c1b155a846449204e78b756fc0355870f704e8e
+Subproject commit a8b5b59043eefa91548da77e361ec1ce4e9a981f
diff --git a/wagtail-localize b/wagtail-localize
index fc91d83..99db76d 160000
--- a/wagtail-localize
+++ b/wagtail-localize
@@ -1 +1 @@
-Subproject commit fc91d832170b987ec54e81eb049333dbe59c6612
+Subproject commit 99db76d307f968fb9a454f8b35fca5419bd431a6
diff --git a/wagtail-shell b/wagtail-shell
new file mode 160000
index 0000000..b1c4bb6
--- /dev/null
+++ b/wagtail-shell
@@ -0,0 +1 @@
+Subproject commit b1c4bb69d790a26361556797bff0f2784b8e799b