diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 6af7bb9de..fc9446eb8 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1061,7 +1061,8 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
              if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
                ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
              else if (ec->comp_data->cursor || e_client_has_xwindow(ec) ||
-                      (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped))
+                      (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped) ||
+                      (ec == e_comp_wl->drag_client))
                {
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
@@ -1076,7 +1077,8 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
              if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
                ec->comp_data->shell.map(ec->comp_data->shell.surface);
              else if (ec->comp_data->cursor || e_client_has_xwindow(ec) ||
-                      (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped))
+                      (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped) ||
+                      (ec == e_comp_wl->drag_client))
                {
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;