diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 4c0490882..5f03f8fec 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -486,7 +486,7 @@ _e_comp_win_geometry_update(E_Comp_Win *cw)
      w = cw->bd->w, h = cw->bd->h;
    else
      w = cw->pw ?: cw->w, h = cw->ph ?: cw->h;
-   e_zoomap_child_resize(cw->zoomobj, w, h);
+   if (cw->zoomobj) e_zoomap_child_resize(cw->zoomobj, w, h);
    if (cw->not_in_layout)
      {
         evas_object_resize(cw->effect_obj, w, h);
@@ -1831,7 +1831,7 @@ _e_comp_win_shadow_setup(E_Comp_Win *cw)
    if (reshadow)
      {
         if (!cw->bd) return;
-        if (cw->bd->bg_object && (e_zoomap_child_get(cw->zoomobj) == cw->bd->bg_object))
+        if (cw->bd->bg_object && (edje_object_part_swallow_get(cw->shobj, "e.swallow.content") == cw->bd->bg_object))
           return;
      }
    if (_e_comp_win_do_shadow(cw) && (!no_shadow))
@@ -1855,22 +1855,26 @@ _e_comp_win_shadow_setup(E_Comp_Win *cw)
    else
      edje_object_signal_emit(cw->shobj, "e,state,visible,off", "e");
 
-   e_zoomap_child_set(cw->zoomobj, NULL);
+   if (cw->zoomobj) e_zoomap_child_set(cw->zoomobj, NULL);
    if (cw->bd && cw->bd->bg_object)
      {
         edje_object_part_swallow(cw->bd->bg_object, "e.swallow.client", cw->obj);
-        e_zoomap_child_set(cw->zoomobj, cw->bd->bg_object);
+        edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->bd->bg_object);
         no_shadow = 1;
      }
    else
      {
         if (cw->bd) no_shadow = 1;
-        e_zoomap_child_set(cw->zoomobj, cw->obj);
+        if (cw->zoomobj)
+          {
+             e_zoomap_child_set(cw->zoomobj, cw->obj);
+             edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->zoomobj);
+          }
+        else
+          edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->obj);
      }
-   if (cw->bd || cw->eobj)
+   if (cw->eobj)
      e_zoomap_child_edje_solid_setup(cw->zoomobj);
-   edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->zoomobj);
-
    if (!cw->visible) return;
 
    if (!cw->animating)
@@ -2178,8 +2182,8 @@ _e_comp_win_add(E_Comp *c, Ecore_X_Window win, E_Border *bd)
         cw->effect_obj = edje_object_add(c->evas);
         e_theme_edje_object_set(cw->effect_obj, "base/theme/comp", "e/comp/effects/none");
         cw->shobj = edje_object_add(c->evas);
-        cw->zoomobj = e_zoomap_add(c->evas);
-        e_zoomap_smooth_set(cw->zoomobj, conf->smooth_windows);
+        //cw->zoomobj = e_zoomap_add(c->evas);
+        //e_zoomap_smooth_set(cw->zoomobj, conf->smooth_windows);
         cw->obj = evas_object_image_filled_add(c->evas);
         evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888);
         if (cw->argb) evas_object_image_alpha_set(cw->obj, 1);
@@ -2214,13 +2218,13 @@ _e_comp_win_add(E_Comp *c, Ecore_X_Window win, E_Border *bd)
           {
              evas_object_data_set(cw->shobj, "border", cw->bd);
              evas_object_data_set(cw->effect_obj, "border", cw->bd);
-             evas_object_name_set(cw->zoomobj, "cw->zoomobj::BORDER");
+             //evas_object_name_set(cw->zoomobj, "cw->zoomobj::BORDER");
              evas_object_name_set(cw->shobj, "cw->shobj::BORDER");
              evas_object_name_set(cw->effect_obj, "cw->effect_obj::BORDER");
           }
         else
           {
-             evas_object_name_set(cw->zoomobj, "cw->zoomobj::WINDOW");
+             //evas_object_name_set(cw->zoomobj, "cw->zoomobj::WINDOW");
              evas_object_name_set(cw->shobj, "cw->shobj::WINDOW");
              evas_object_name_set(cw->effect_obj, "cw->effect_obj::WINDOW");
           }
@@ -3359,7 +3363,7 @@ _e_comp_bd_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
              _e_comp_win_bd_setup(cw, ev->border);
              evas_object_data_set(cw->shobj, "border", cw->bd);
              evas_object_data_set(cw->effect_obj, "border", cw->bd);
-             evas_object_name_set(cw->zoomobj, "cw->zoomobj::BORDER");
+             //evas_object_name_set(cw->zoomobj, "cw->zoomobj::BORDER");
              evas_object_name_set(cw->shobj, "cw->shobj::BORDER");
              evas_object_name_set(cw->effect_obj, "cw->effect_obj::BORDER");
              e_comp_win_reshadow(cw);
@@ -3533,7 +3537,8 @@ _e_comp_bd_fullscreen(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
    if (!cw) return ECORE_CALLBACK_PASS_ON;
    e_comp_win_reshadow(cw);
    /* bd->bg_object deletion pending */
-   e_zoomap_child_set(cw->zoomobj, cw->obj);
+   //e_zoomap_child_set(cw->zoomobj, cw->obj);
+   edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->obj);
    return ECORE_CALLBACK_PASS_ON;
 }