diff --git a/src/core/window.c b/src/core/window.c
index f72260f5d..d93e723a5 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3192,7 +3192,10 @@ meta_window_tile (MetaWindow   *window,
 
   /* Don't do anything if no tiling is requested */
   if (window->tile_mode == META_TILE_NONE)
-    return;
+    {
+      window->tile_monitor_number = -1;
+      return;
+    }
 
   if (window->tile_mode == META_TILE_MAXIMIZED)
     directions = META_MAXIMIZE_BOTH;