diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index f6e092af5..d8c5c157e 100644
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -130,7 +130,8 @@ e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2,
    E_Shelf *es;
    E_Maximize_Rect *r;
 
-   EINA_LIST_FOREACH(e_shelf_list(), l, es)
+   l = e_shelf_list_all();
+   EINA_LIST_FREE(l, es)
      {
         Eina_List *ll;
         E_Config_Shelf_Desk *sd;