diff --git a/0001-Avoid-double-slash-in-path-when-creating-default-fol.patch b/0001-Avoid-double-slash-in-path-when-creating-default-fol.patch
new file mode 100644
index 0000000..7277ec4
--- /dev/null
+++ b/0001-Avoid-double-slash-in-path-when-creating-default-fol.patch
@@ -0,0 +1,40 @@
+From 4016f8373d9e1251e76833054598e29c882becaf Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Tue, 15 Mar 2022 13:25:16 -0700
+Subject: [PATCH] Avoid double slash in path when creating default folders
+
+Creating these default folders still doesn't work. After some
+investigation I found that's because the template we use for
+the path when creating the `child` `Gio.Settings` instance
+results in a double slash - it comes out as e.g.
+/org/gnome/desktop/app-folders//folders/Utilities/ . dconf does
+not gracefully handle this as many other things that handle
+paths do, it considers it a programmer error. It results in
+error messages like:
+
+dconf_changeset_set: assertion 'dconf_is_path (path, NULL)' failed
+
+which is slightly confusing. Anyway, we fix it by removing a
+slash from the template.
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ js/ui/appDisplay.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
+index 116e9931d..4fa2a5f63 100644
+--- a/js/ui/appDisplay.js
++++ b/js/ui/appDisplay.js
+@@ -1471,7 +1471,7 @@ class AppDisplay extends BaseAppView {
+             const { name, categories, apps } = DEFAULT_FOLDERS[folder];
+             const child = new Gio.Settings({
+                 schema_id: 'org.gnome.desktop.app-folders.folder',
+-                path: `${path}/folders/${folder}/`,
++                path: `${path}folders/${folder}/`,
+             });
+             child.set_string('name', name);
+             child.set_boolean('translate', true);
+-- 
+2.35.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 69ee40a..eb232a5 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        42.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -19,6 +19,11 @@ Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch
 # Work around crashy tear down
 Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
 
+# Fix default folder creation
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2242
+# https://bugzilla.redhat.com/show_bug.cgi?id=2064473
+Patch80001: 0001-Avoid-double-slash-in-path-when-creating-default-fol.patch
+
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
 %define glib2_version 2.56.0
@@ -232,6 +237,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Tue Mar 15 2022 Adam Williamson <awilliam@redhat.com> - 42.0-2
+- Backport MR #2242 to fix new user default folder creation (#2064473)
+
 * Sun Mar 13 2022 Florian Müllner <fmuellner@redhat.com> - 42.0-1
 - Update to 42.0