diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 0f9995fbd..78b7da3c2 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -275,8 +275,8 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, E
    e_gadcon_zone_set(es->gadcon, zone);
    e_gadcon_ecore_evas_set(es->gadcon, es->ee);
    e_gadcon_shelf_set(es->gadcon, es);
-   e_gadcon_xdnd_window_set(es->gadcon, e_comp_get(es)->win);
-   e_gadcon_dnd_window_set(es->gadcon, e_comp_get(es)->win);
+   e_gadcon_xdnd_window_set(es->gadcon, e_comp_get(es)->ee_win);
+   e_gadcon_dnd_window_set(es->gadcon, e_comp_get(es)->ee_win);
    evas_object_clip_set(es->o_base, es->zone->bg_clip_object);
    e_gadcon_util_menu_attach_func_set(es->gadcon,
                                       _e_shelf_cb_menu_items_append, es);
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index 2986286dd..0e0e4a1dc 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -787,8 +787,8 @@ _gadman_gadcon_new(const char *name, Gadman_Layer_Type layer, E_Zone *zone, E_Ga
      {
         gc->evas = Man->container->bg_evas;
         e_gadcon_ecore_evas_set(gc, Man->container->bg_ecore_evas);
-        e_gadcon_xdnd_window_set(gc, Man->container->bg_win);
-        e_gadcon_dnd_window_set(gc, Man->container->event_win);
+        e_gadcon_xdnd_window_set(gc, e_comp_get(Man->container)->ee_win);
+        e_gadcon_dnd_window_set(gc, e_comp_get(Man->container)->ee_win);
         e_drop_xdnd_register_set(Man->container->bg_win, 1);
      }
    e_gadcon_drop_handler_add(gc, _gadman_gadcon_dnd_enter_cb, _gadman_gadcon_dnd_leave_cb,