diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 8e4f3a7dc..e3ea1e8aa 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1551,6 +1551,10 @@ process_mouse_move_resize_grab (MetaDisplay *display,
 
   if (keysym == XK_Escape)
     {
+      /* Hide the tiling preview if necessary */
+      if (window->tile_mode != META_TILE_NONE)
+        meta_screen_tile_preview_hide (screen);
+
       /* End move or resize and restore to original state.  If the
        * window was a maximized window that had been "shaken loose" we
        * need to remaximize it.  In normal cases, we need to do a