diff --git a/src/modules/illume2/e_mod_layout.c b/src/modules/illume2/e_mod_layout.c
index 4caa21ffb..21bcee2a6 100644
--- a/src/modules/illume2/e_mod_layout.c
+++ b/src/modules/illume2/e_mod_layout.c
@@ -492,6 +492,7 @@ _e_mod_layout_cb_client_message(void *data, int type, void *event)
           {
              E_Border *fb;
 
+             if (fbd->zone != bd->zone) continue;
              if (e_object_is_del(E_OBJECT(fbd))) continue;
              if ((!fbd->client.icccm.accepts_focus) && 
                  (!fbd->client.icccm.take_focus)) continue;
diff --git a/src/modules/illume2/policies/illume/layout.c b/src/modules/illume2/policies/illume/layout.c
index 723b351b7..a6b37c71d 100644
--- a/src/modules/illume2/policies/illume/layout.c
+++ b/src/modules/illume2/policies/illume/layout.c
@@ -51,6 +51,7 @@ _layout_border_del(E_Border *bd)
         b = e_illume_border_top_shelf_get(bd->zone);
         if (b) e_border_show(b);
      }
+   ecore_x_e_illume_back_send(bd->zone->black_win);
 }
 
 void