diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index 78b68d14e2..16a3fb3c60 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -159,7 +159,9 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const
         xdg_shell_add_listener(ewd->wl.xdg_shell, &_xdg_shell_listener, NULL);
 
         EINA_INLIST_FOREACH(ewd->windows, window)
-          _ecore_wl2_window_shell_surface_init(window);
+          if ((window->type != ECORE_WL2_WINDOW_TYPE_DND) &&
+              (window->type != ECORE_WL2_WINDOW_TYPE_NONE))
+                _ecore_wl2_window_shell_surface_init(window);
      }
    else if (!strcmp(interface, "zxdg_shell_v6"))
      {