diff --git a/src/core/display.c b/src/core/display.c
index bdf5a150c..62c63e9d8 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1193,7 +1193,6 @@ meta_grab_op_is_mouse (MetaGrabOp op)
     case META_GRAB_OP_KEYBOARD_RESIZING_SW:
     case META_GRAB_OP_KEYBOARD_RESIZING_NW:
     case META_GRAB_OP_KEYBOARD_MOVING:
-    case META_GRAB_OP_COMPOSITOR:
       return TRUE;
 
     default:
@@ -1216,7 +1215,6 @@ meta_grab_op_is_keyboard (MetaGrabOp op)
     case META_GRAB_OP_KEYBOARD_RESIZING_NE:
     case META_GRAB_OP_KEYBOARD_RESIZING_SW:
     case META_GRAB_OP_KEYBOARD_RESIZING_NW:
-    case META_GRAB_OP_COMPOSITOR:
       return TRUE;
 
     default:
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index e75be27fb..09f803db9 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -370,8 +370,7 @@ sync_focus_surface (MetaWaylandPointer *pointer)
   MetaWaylandSurface *focus_surface;
 
   /* Don't update the focus surface while we have a special grab. */
-  if (meta_grab_op_is_mouse (display->grab_op) &&
-      display->grab_op != META_GRAB_OP_COMPOSITOR)
+  if (meta_grab_op_is_mouse (display->grab_op))
     return;
 
   focus_surface = get_focus_surface (pointer);