diff --git a/src/lib/elementary/efl_selection_manager.c b/src/lib/elementary/efl_selection_manager.c
index 68033a60b7..50f0cd000c 100644
--- a/src/lib/elementary/efl_selection_manager.c
+++ b/src/lib/elementary/efl_selection_manager.c
@@ -790,12 +790,14 @@ _x11_data_preparer_image(Sel_Manager_Seat_Selection *seat_sel EINA_UNUSED,
 static Eina_Bool
 _x11_win_filter(Eo *manager, Ecore_X_Window xwin)
 {
-   Eo *win = efl_parent_get(manager);
-   if (!win) return EINA_TRUE;
-   win = efl_ui_widget_top_get(win);
-   if (!win) return EINA_TRUE;
-   if (xwin != elm_win_xwindow_get(win)) return EINA_TRUE;
-   return EINA_FALSE;
+   Eo *win;
+   const Eina_List *l;
+
+   EINA_LIST_FOREACH(_elm_win_list, l, win)
+     {
+        if (elm_win_window_id_get(win) == xwin) return EINA_FALSE;
+     }
+   return EINA_TRUE;
 }
 
 /*
diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c
index 8c50f54581..f40b95a028 100644
--- a/src/lib/elementary/efl_ui_dnd.c
+++ b/src/lib/elementary/efl_ui_dnd.c
@@ -25,16 +25,12 @@ static inline Eo *
 _selection_manager_get(Eo *obj)
 {
    if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return NULL;
-   Eo *top = elm_widget_top_get(obj);
-   if (!top)
-     {
-        top = obj;
-     }
-   Eo *sel_man = efl_key_data_get(top, "__selection_manager");
+   Eo *app = efl_app_get();
+   Eo *sel_man = efl_key_data_get(app, "__selection_manager");
    if (!sel_man)
      {
-        sel_man = efl_add(EFL_SELECTION_MANAGER_CLASS, top);
-        efl_key_data_set(top, "__selection_manager", sel_man);
+        sel_man = efl_add(EFL_SELECTION_MANAGER_CLASS, app);
+        efl_key_data_set(app, "__selection_manager", sel_man);
      }
    return sel_man;
 }