diff --git a/ChangeLog b/ChangeLog
index c2f5cfc4c..4644bbdb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-2013-02-04 Mike Blumenkrantz
+2013-02-05 Mike Blumenkrantz
 
         * improve load time of apps dialogs
+        * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf
 
 2013-02-04 Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index 509c16b84..f40a929d0 100644
--- a/NEWS
+++ b/NEWS
@@ -143,3 +143,4 @@ Fixes:
     * fix possible crash in xkb rule parsing
     * fix list update on deletion of personal app launchers
     * fix button toggling in personal app launchers dialog
+    * fix bug where edge flips would stop functioning after dragging to an invalid edge containing a shelf
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 63dceef82..946e3172a 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -534,6 +534,7 @@ noflip:
         zone->flip.es = es;
         e_shelf_toggle(es, 1);
      }
+   ok = 0;
    switch (edge)
      {
       case E_ZONE_EDGE_LEFT: