diff --git a/mutter-wayland-fix-keyboard-move-resize-window.patch b/mutter-wayland-fix-keyboard-move-resize-window.patch
new file mode 100644
index 0000000..8cc23d4
--- /dev/null
+++ b/mutter-wayland-fix-keyboard-move-resize-window.patch
@@ -0,0 +1,36 @@
+diff --git a/src/core/keybindings.c b/src/core/keybindings.c
+index b86272541..b995075fb 100644
+--- a/src/core/keybindings.c
++++ b/src/core/keybindings.c
+@@ -1820,12 +1820,12 @@ meta_window_grab_all_keys (MetaWindow  *window,
+       meta_topic (META_DEBUG_KEYBINDINGS,
+                   "Grabbing all keys on window %s\n", window->desc);
+       retval = grab_keyboard (grabwindow, timestamp, XIGrabModeAsync);
+-      if (retval)
+-        {
+-          window->keys_grabbed = FALSE;
+-          window->all_keys_grabbed = TRUE;
+-          window->grab_on_frame = window->frame != NULL;
+-        }
++    }
++  if (retval)
++    {
++      window->keys_grabbed = FALSE;
++      window->all_keys_grabbed = TRUE;
++      window->grab_on_frame = window->frame != NULL;
+     }
+ 
+   return retval;
+@@ -1835,9 +1835,10 @@ void
+ meta_window_ungrab_all_keys (MetaWindow *window,
+                              guint32     timestamp)
+ {
+-  if (!meta_is_wayland_compositor () && window->all_keys_grabbed)
++  if (window->all_keys_grabbed)
+     {
+-      ungrab_keyboard (timestamp);
++      if (!meta_is_wayland_compositor())
++        ungrab_keyboard (timestamp);
+ 
+       window->grab_on_frame = FALSE;
+       window->all_keys_grabbed = FALSE;
diff --git a/mutter.changes b/mutter.changes
index 36c0e0f..a3d10af 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 13 02:17:24 UTC 2020 - Alynx Zhou <alynx.zhou@suse.com>
+
+- Add mutter-wayland-fix-keyboard-move-resize-window.patch:
+  move some common code out of X11 only code blocks to fix it
+  (bsc#1159976, glgo#GNOME/mutter!997).
+
 -------------------------------------------------------------------
 Mon Mar 02 10:50:18 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/mutter.spec b/mutter.spec
index b431372..6acb549 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -39,6 +39,8 @@ Patch4:         mutter-disable-cvt-s390x.patch
 Patch5:         mutter-fix-mesa20.patch
 # PATCH-FIX-UPSTREAM 0001-Update-to-PipeWire-0.3-API.patch alarrosa@suse.de -- Port mutter to build with pipewire 0.3.0
 Patch6:         0001-Update-to-PipeWire-0.3-API.patch
+# PATCH-FIX-UPSTREAM mutter-wayland-fix-keyboard-move-resize-window.patch bsc#1159976, glgo#GNOME/mutter!997 alynx.zhou@suse.com -- Fix window keyboard move/resize mode in wayland
+Patch7:         mutter-wayland-fix-keyboard-move-resize-window.patch
 ## SLE-only patches start at 1000
 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
 Patch1000:      mutter-SLE-bell.patch
@@ -161,6 +163,7 @@ applications that want to make use of the mutter library.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # SLE-only patches and translations.
 translation-update-upstream po mutter