diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index dd499310c..d1baf1673 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -5,8 +5,6 @@
 
 /* FIXME: broken when drop areas intersect 
  * (sub window has drop area on top of lower window or desktop)
- * 
- * When moving from one zone to another, the flip timer in the previous zone must be reset.
  */
 /*
  * TODO:
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index a908c4170..272075324 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -951,6 +951,11 @@ _e_zone_cb_timer(void *data)
    if (!ev) return 0;
 
    zone = data;
+   if (zone != e_zone_current_get(zone->container))
+     {
+	zone->flip.timer = NULL;
+	return 0;
+     }
 
    ecore_x_pointer_xy_get(zone->container->win, &x, &y);
    ev->prev.x = x;