diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index dcfcd5bfd..630b143ad 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -494,7 +494,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
    bd->new_client = 1;
    bd->changed = 1;
 
-   bd->zone = e_zone_current_get(con);
+//   bd->zone = e_zone_current_get(con);
    bd->desk = e_desk_current_get(bd->zone);
    e_container_border_add(bd);
    borders = eina_list_append(borders, bd);
@@ -626,9 +626,9 @@ e_border_zone_set(E_Border *bd, E_Zone *zone)
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   if (bd->zone == zone) return;
    if (!zone) return;
-   
+   if (bd->zone == zone) return;
+
    /* if the window does not lie in the new zone, move it so that it does */
    if (!E_INTERSECTS(bd->x, bd->y, bd->w, bd->h, zone->x, zone->y, zone->w, zone->h))
      {