diff --git a/TODO b/TODO
index b99a9a27a..a6ce22512 100644
--- a/TODO
+++ b/TODO
@@ -18,15 +18,7 @@ Some of the things (in very short form) that need to be done to E17...
   attaches to the 2nd zone, not the first), crashes have been reported too.
 * BUG: dnd icon from window that has no .eap defining its icon to ibar and the
   ibar icon ends up blank (can't build .eap from ARGB pixels)
-* BUG: edge flip for desktops still active if turned off when dragging a window
-  off the desktop - either a separate config value (recommended) or turn it
-  off for window dragging too
-* BUG: desktop settings is missing preview
 * BUG: modules need to destroy config dialogs on shutdown (otherwise - segv!)
-* BUG: IBAR follower speed and autoscroll speed are not pixels / sec (they are
-  recursive multiplication values). should invert gui values and display as a
-  factor, not px/sec
-* BUG: changing border from shaped to not shaped produces shadow bugs
 * BUG: xdaliclock -transparent doesnt use shaped border (not handling shape
   change later)
 * BUG: if a user selects a border the border should not just change based on
@@ -34,8 +26,6 @@ Some of the things (in very short form) that need to be done to E17...
 * BUG: if you iconify a window and while iconified the window unmaps
   (rhythmbox does this a lot apparently) e doesnt realize and still thinks
   it's iconified.
-* BUG: dnd to ibar is broken if you did an icon that isn't IN the ibar yet
-  (from a window border) to either the very start or end of the ibar.
 * BUG: in general fullscreen needs work, cleaning and testing. dont allow
   desktop switches for the desk a fullscreened window is on, nor allow windows
   to be raised above the fs win etc. ie the app must seem to be entirely fs for
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 1992df461..0314c22f6 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -270,6 +270,7 @@ e_zone_flip_coords_handle(E_Zone *zone, int x, int y)
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
    
+   if (!e_config->use_edge_flip) return;
    if ((y == 0) && E_ZONE_FLIP_UP(zone))
      {
 	/* top */