diff --git a/ChangeLog b/ChangeLog
index 5cb1482e5..7470f468c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2013-02-11 Mike Blumenkrantz
 
         * fixed bug where pointer warping to new clients would start at a random location
+        * fix crash when locking screen from Start gadget and then activating gadget again
 
 2013-02-08 Cedric Bail
 
diff --git a/NEWS b/NEWS
index 5d100607b..ad28cbb5a 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ Fixes:
     * keyboard mapping change now also disables for window class "vmware"
     * don't call efreet_menu_parse from a thread
     * fixed bug where pointer warping to new clients would start at a random location
+    * fix crash when locking screen from Start gadget and then activating gadget again
 
 
 Changes since 0.17.0:
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 40083cf6e..acae3a328 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1359,7 +1359,10 @@ _e_menu_cb_intercept_item_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Co
    evas_object_move(mi->event_object, x, y);
    evas_object_move(o, x, y);
    if ((mi->submenu) && (mi->submenu->parent_item))
-     _e_menu_reposition(mi->submenu);
+     {
+        mi->submenu->zone = mi->menu->zone;
+        _e_menu_reposition(mi->submenu);
+     }
 }
 
 static void