diff --git a/src/core/window.c b/src/core/window.c
index f61d872ea..09020d590 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3977,6 +3977,9 @@ meta_window_move_to_monitor (MetaWindow  *window,
 {
   MetaRectangle old_area, new_area;
 
+  if (window->tile_mode != META_TILE_NONE)
+    window->tile_monitor_number = monitor;
+
   meta_window_get_work_area_for_monitor (window,
                                          window->monitor->number,
                                          &old_area);
@@ -3998,9 +4001,6 @@ meta_window_move_to_monitor (MetaWindow  *window,
       meta_window_move_between_rects (window, &old_area, &new_area);
     }
 
-  if (window->tile_mode != META_TILE_NONE)
-    window->tile_monitor_number = monitor;
-
   window->preferred_output_winsys_id = window->monitor->winsys_id;
 
   if (window->fullscreen || window->override_redirect)