diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 0ea274cb5..490fd0749 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -376,7 +376,6 @@ _e_comp_wl_data_source_cb_resource_destroy(struct wl_resource *resource)
 
    if (e_comp_wl->drag_source == source)
      {
-        e_comp_wl->drag_source = NULL;
         //free the drag here
         e_object_del(E_OBJECT(e_comp_wl->drag));
         e_comp_wl->drag = NULL;
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index aecf4302d..bff497eea 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -1072,8 +1072,6 @@ _e_drag_end(int x, int y)
    _drag_current->cb.finished = NULL;
 
    e_object_del(E_OBJECT(_drag_current));
-   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-     e_comp_ungrab_input(1, 1);
 }
 
 static void
@@ -1153,6 +1151,10 @@ _e_drag_free(E_Drag *drag)
           ecore_x_window_free(_drag_win);
         ecore_x_window_shadow_tree_flush();
      }
+   else
+     {
+        e_comp_ungrab_input(1, 1);
+     }
 #endif
    e_bindings_disabled_set(0);
    _drag_win = 0;