diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index b04d9a60e6..e5a0774ff3 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -953,7 +953,10 @@ ecore_wl2_window_pointer_set(Ecore_Wl2_Window *window, struct wl_surface *surfac
    input->cursor.hot_x = hot_x;
    input->cursor.hot_y = hot_y;
 
-   _ecore_wl2_input_cursor_update(input);
+   if (!input->cursor.surface)
+     _ecore_wl2_input_cursor_update_stop(input);
+   else
+     _ecore_wl2_input_cursor_update(input);
 }
 
 EAPI void