diff --git a/src/core/window.c b/src/core/window.c
index 60a69f304..5729d5778 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -7569,8 +7569,8 @@ meta_window_handle_mouse_grab_op_event  (MetaWindow         *window,
                    */
                   update_tile_mode (window);
                 }
-              meta_display_end_grab_op (window->display, event->any.time);
             }
+          meta_display_end_grab_op (window->display, event->any.time);
         }
       break;