diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c
index 9dc37aa177..563b2ba285 100644
--- a/src/lib/efl_wl/efl_wl.c
+++ b/src/lib/efl_wl/efl_wl.c
@@ -3787,7 +3787,11 @@ seat_ptr_set_cursor(struct wl_client *client, struct wl_resource *resource, uint
         eina_tiler_clear(cs->pending.input);
         evas_object_pass_events_set(cs->obj, 1);
      }
-   if (s->ptr.cursor.surface) s->ptr.cursor.surface->cursor = 0;
+   if (s->ptr.cursor.surface)
+     {
+        s->ptr.cursor.surface->cursor = 0;
+        s->ptr.cursor.surface->role = NULL;
+     }
 
    if (s->ptr.in)
      {