diff --git a/gnome-shell-exit-crash-workaround.patch b/gnome-shell-exit-crash-workaround.patch
new file mode 100644
index 0000000..c475250
--- /dev/null
+++ b/gnome-shell-exit-crash-workaround.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main.c b/src/main.c
+index 3cd9e10..557f35a 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -566,7 +566,7 @@ main (int argc, char **argv)
+       ecode = EXIT_FAILURE;
+     }
+ 
+-  meta_context_destroy (g_steal_pointer (&context));
++  g_steal_pointer (&context);
+ 
+   shell_profiler_shutdown ();
+ 
diff --git a/gnome-shell.changes b/gnome-shell.changes
index ef06180..f053eac 100644
--- a/gnome-shell.changes
+++ b/gnome-shell.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Dec 17 04:09:17 UTC 2021 - QK ZHU <qkzhu@suse.com>
+
+- Add gnome-shell-exit-crash-workaround.patch: 
+  + Backport from Ubuntu, This is a workaround to maintain a clean
+    environment for gnome-shell and particularly JavaScript/GJS to
+    shutdown without crashing.
+  + Proper fixes are still pending
+    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1759
+    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/648
+    (bsc#1190878 glgo#GNOME/gnome-shell#4344).
+
 -------------------------------------------------------------------
 Mon Dec 13 16:07:50 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-shell.spec b/gnome-shell.spec
index f1892d7..b8c2d53 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -47,6 +47,8 @@ Patch5:         gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.pa
 Patch6:         gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
 # PATCH-FIX-OPENSUSE gnome-shell-executable-path-not-absolute.patch bsc#1176051 xwang@suse.com --  Fix ExecStart is not absolute path
 Patch7:         gnome-shell-executable-path-not-absolute.patch
+# PATCH-FIX-UPSTREAM gnome-shell-exit-crash-workaround.patch bsc#1190878 glgo#GNOME/gnome-shell#4344 qkzhu@suse.com -- Workaround logout crashing
+Patch8:         gnome-shell-exit-crash-workaround.patch
 
 ## NOTE: Keep SLE-only patches at bottom (starting on 1000).
 # PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
@@ -184,6 +186,7 @@ This package contains an optional extensions app for managing GNOME Shell extens
 %patch6 -p1
 %endif
 %patch7 -p1
+%patch8 -p1
 
 %if 0%{?sle_version}
 %patch1001 -p1