diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index a766db4022..2b601ae27a 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -578,7 +578,7 @@ _ecore_evas_drm_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, i
 {
    int x, y;
    Evas_Object *old;
-   
+
    old = ee->prop.cursor.object;
    if (obj == NULL)
      {
@@ -588,7 +588,7 @@ _ecore_evas_drm_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, i
         ee->prop.cursor.hot.y = 0;
         goto end;
      }
-   
+
    ee->prop.cursor.object = obj;
    ee->prop.cursor.layer = layer;
    ee->prop.cursor.hot.x = hot_x;
@@ -605,9 +605,10 @@ _ecore_evas_drm_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, i
         evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                        _ecore_evas_drm_object_cursor_del, ee);
      }
-   evas_object_move(ee->prop.cursor.object,
-                    x - ee->prop.cursor.hot.x,
+
+   evas_object_move(ee->prop.cursor.object, x - ee->prop.cursor.hot.x,
                     y - ee->prop.cursor.hot.y);
+
 end:
    if ((old) && (obj != old))
      {
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 1b7e9c9e9d..db0f7e775f 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -426,7 +426,7 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
 {
    int x, y;
    Evas_Object *old;
-   
+
    old = ee->prop.cursor.object;
    if (obj == NULL)
      {
@@ -436,7 +436,7 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
         ee->prop.cursor.hot.y = 0;
         goto end;
      }
-   
+
    ee->prop.cursor.object = obj;
    ee->prop.cursor.layer = layer;
    ee->prop.cursor.hot.x = hot_x;
@@ -453,9 +453,10 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
         evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                        _ecore_evas_object_cursor_del, ee);
      }
-   evas_object_move(ee->prop.cursor.object,
-                    x - ee->prop.cursor.hot.x,
+
+   evas_object_move(ee->prop.cursor.object, x - ee->prop.cursor.hot.x,
                     y - ee->prop.cursor.hot.y);
+
 end:
    if ((old) && (obj != old))
      {
diff --git a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
index bc71654315..4b589d8a7a 100644
--- a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
+++ b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
@@ -318,7 +318,7 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
 {
    int x, y;
    Evas_Object *old;
-   
+
    old = ee->prop.cursor.object;
    if (obj == NULL)
      {
@@ -328,12 +328,12 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
         ee->prop.cursor.hot.y = 0;
         goto end;
      }
-   
+
    ee->prop.cursor.object = obj;
    ee->prop.cursor.layer = layer;
    ee->prop.cursor.hot.x = hot_x;
    ee->prop.cursor.hot.y = hot_y;
-   
+
    if (obj != old)
      {
         evas_pointer_output_xy_get(ee->evas, &x, &y);
@@ -344,9 +344,10 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
         evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                        _ecore_evas_object_cursor_del, ee);
      }
-   evas_object_move(ee->prop.cursor.object,
-                    x - ee->prop.cursor.hot.x,
+
+   evas_object_move(ee->prop.cursor.object, x - ee->prop.cursor.hot.x,
                     y - ee->prop.cursor.hot.y);
+
 end:
    if ((old) && (obj != old))
      {
diff --git a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
index d54e042620..dcfa6cf373 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -358,7 +358,7 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
 {
    int x, y;
    Evas_Object *old;
-   
+
    old = ee->prop.cursor.object;
    if (obj == NULL)
      {
@@ -368,12 +368,12 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
         ee->prop.cursor.hot.y = 0;
         goto end;
      }
-   
+
    ee->prop.cursor.object = obj;
    ee->prop.cursor.layer = layer;
    ee->prop.cursor.hot.x = hot_x;
    ee->prop.cursor.hot.y = hot_y;
-   
+
    evas_pointer_output_xy_get(ee->evas, &x, &y);
 
    if (obj != old)
@@ -385,9 +385,10 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int h
         evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                        _ecore_evas_object_cursor_del, ee);
      }
-   evas_object_move(ee->prop.cursor.object,
-                    x - ee->prop.cursor.hot.x,
+
+   evas_object_move(ee->prop.cursor.object, x - ee->prop.cursor.hot.x,
                     y - ee->prop.cursor.hot.y);
+
 end:
    if ((old) && (obj != old))
      {
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 7dd686eccc..532e900b36 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1181,7 +1181,7 @@ _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int la
    int x, y, fx, fy;
    Ecore_Evas_Engine_Wl_Data *wdata = ee->engine.data;
    Evas_Object *old;
-   
+
    old = ee->prop.cursor.object;
    if (obj == NULL)
      {
@@ -1191,12 +1191,12 @@ _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int la
         ee->prop.cursor.hot.y = 0;
         goto end;
      }
-   
+
    ee->prop.cursor.object = obj;
    ee->prop.cursor.layer = layer;
    ee->prop.cursor.hot.x = hot_x;
    ee->prop.cursor.hot.y = hot_y;
-   
+
    evas_pointer_output_xy_get(ee->evas, &x, &y);
 
    if (obj != old)
@@ -1209,10 +1209,11 @@ _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int la
         evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                        _ecore_evas_object_cursor_del, ee);
      }
+
    evas_output_framespace_get(ee->evas, &fx, &fy, NULL, NULL);
-   evas_object_move(ee->prop.cursor.object,
-                    x - fx - ee->prop.cursor.hot.x,
+   evas_object_move(ee->prop.cursor.object, x - fx - ee->prop.cursor.hot.x,
                     y - fy - ee->prop.cursor.hot.y);
+
 end:
    if ((old) && (obj != old))
      {
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 4da89ca5a6..f921cbdb1b 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -823,7 +823,7 @@ _ecore_evas_win32_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int ho
 {
    int x, y;
    Evas_Object *old;
-   
+
    old = ee->prop.cursor.object;
    if (obj == NULL)
      {
@@ -833,7 +833,7 @@ _ecore_evas_win32_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int ho
         ee->prop.cursor.hot.y = 0;
         goto end;
      }
-   
+
    ee->prop.cursor.object = obj;
    ee->prop.cursor.layer = layer;
    ee->prop.cursor.hot.x = hot_x;
@@ -851,9 +851,10 @@ _ecore_evas_win32_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int ho
         evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                        _ecore_evas_object_cursor_del, ee);
      }
-   evas_object_move(ee->prop.cursor.object,
-                    x - ee->prop.cursor.hot.x,
+
+   evas_object_move(ee->prop.cursor.object, x - ee->prop.cursor.hot.x,
                     y - ee->prop.cursor.hot.y);
+
 end:
    if ((old) && (obj != old))
      {
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 4e0b3444e3..1bc3568bd8 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -3003,8 +3003,8 @@ _ecore_evas_x_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int
         evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                        _ecore_evas_object_cursor_del, ee);
      }
-   evas_object_move(ee->prop.cursor.object,
-                    x - ee->prop.cursor.hot.x,
+
+   evas_object_move(ee->prop.cursor.object, x - ee->prop.cursor.hot.x,
                     y - ee->prop.cursor.hot.y);
 
 end: