diff --git a/src/core/workspace.c b/src/core/workspace.c
index ea999bc3f..66bda4659 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -579,8 +579,7 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
     return;
 
   move_window = NULL;
-  if (workspace->screen->display->grab_op == META_GRAB_OP_MOVING ||
-      workspace->screen->display->grab_op == META_GRAB_OP_KEYBOARD_MOVING)
+  if (meta_grab_op_is_moving (workspace->screen->display->grab_op)
     move_window = workspace->screen->display->grab_window;
 
   if (move_window != NULL)