Index: src/lib/canvas/evas_events.c
===================================================================
--- src/lib/canvas/evas_events.c	(revision 65000)
+++ src/lib/canvas/evas_events.c	(working copy)
@@ -443,6 +443,8 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Butt
             e->pointer.mouse_grabbed);
      }
 
+   /* remove released touch point from the touch point list */
+   _evas_touch_point_remove(e, 0);
    _evas_unwalk(e);
 }
 
@@ -463,8 +465,6 @@ evas_event_feed_mouse_cancel(Evas *e, unsigned int
         if ((e->pointer.button & (1 << i)))
           evas_event_feed_mouse_up(e, i + 1, 0, timestamp, data);
      }
-   /* remove released touch point from the touch point list */
-   _evas_touch_point_remove(e, 0);
    _evas_unwalk(e);
 }