diff --git a/SOURCES/0001-auto-move-windows-Don-t-move-windows-already-on-all-.patch b/SOURCES/0001-auto-move-windows-Don-t-move-windows-already-on-all-.patch
new file mode 100644
index 0000000..665227c
--- /dev/null
+++ b/SOURCES/0001-auto-move-windows-Don-t-move-windows-already-on-all-.patch
@@ -0,0 +1,33 @@
+From 8a5e793b3d984f3acc378cf8914410311e9dde0e Mon Sep 17 00:00:00 2001
+From: Daniel van Vugt <daniel.van.vugt@canonical.com>
+Date: Thu, 28 Jan 2021 16:33:50 +0800
+Subject: [PATCH] auto-move-windows: Don't move windows already on all
+ workspaces
+
+This fixes a particular case of mutter#992.
+
+Although gnome-shell will also be softened to not crash in future, it's
+also a good idea for the extension to explicitly decide how it wants to
+handle windows that are already on all workspaces.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/157>
+---
+ extensions/auto-move-windows/extension.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extensions/auto-move-windows/extension.js b/extensions/auto-move-windows/extension.js
+index b9bc3a0..3859809 100644
+--- a/extensions/auto-move-windows/extension.js
++++ b/extensions/auto-move-windows/extension.js
+@@ -72,7 +72,7 @@ class WindowMover {
+     }
+ 
+     _moveWindow(window, workspaceNum) {
+-        if (window.skip_taskbar)
++        if (window.skip_taskbar || window.is_on_all_workspaces())
+             return;
+ 
+         // ensure we have the required number of workspaces
+-- 
+2.37.1
+
diff --git a/SPECS/gnome-shell-extensions.spec b/SPECS/gnome-shell-extensions.spec
index 3f6693f..7e70373 100644
--- a/SPECS/gnome-shell-extensions.spec
+++ b/SPECS/gnome-shell-extensions.spec
@@ -6,7 +6,7 @@
 
 Name:           gnome-shell-extensions
 Version:        3.32.1
-Release:        28%{?dist}
+Release:        29%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
 Group:          User Interface/Desktops
@@ -50,6 +50,7 @@ Patch0021:         0001-desktop-icons-Fix-stuck-grab-issue-with-rubber-bandi.pat
 Patch0022:         0001-gesture-inhibitor-Put-a-foot-down-with-self-enabling.patch
 Patch0023:         0001-desktop-icons-Use-a-single-unique-name-to-access-nau.patch
 Patch0024:         window-list-touch.patch
+Patch0025:         0001-auto-move-windows-Don-t-move-windows-already-on-all-.patch
 
 %description
 GNOME Shell Extensions is a collection of extensions providing additional and
@@ -548,6 +549,10 @@ cp $RPM_SOURCE_DIR/gnome-classic.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions
 
 
 %changelog
+* Mon Aug 29 2022 Jonas Ådahl <jadahl@redhat.com> - 3.32.1-29
+- Avoid invalid window management in auto-move-windows
+  Resolves: #2089311
+
 * Wed Jun 22 2022 Florian Müllner <fmuellner@redhat.com> - 3.32.1-28
 - Improve window-list on touch
   Resolves: #2050000