diff --git a/src/core/window.c b/src/core/window.c
index c3866ade2..0cfbe2ba8 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4872,7 +4872,13 @@ meta_window_raise (MetaWindow  *window)
    * the child windows appropriately.
    */
   if (window->screen->stack == ancestor->screen->stack)
-    meta_stack_raise (window->screen->stack, ancestor);
+    {
+      /* If the window has a tile sibling, raise it before raising the window itself */
+      if (window->tile_match)
+        meta_stack_raise (window->tile_match->screen->stack, window->tile_match);
+
+      meta_stack_raise (window->screen->stack, ancestor);
+    }
   else
     {
       meta_warning (
@@ -4904,6 +4910,10 @@ meta_window_lower (MetaWindow  *window)
   meta_topic (META_DEBUG_WINDOW_OPS,
               "Lowering window %s\n", window->desc);
 
+  /* If the window has a tile sibling, lower it before loweting the window itself */
+  if (window->tile_match)
+    meta_stack_lower (window->tile_match->screen->stack, window->tile_match);
+
   meta_stack_lower (window->screen->stack, window);
 }