diff --git a/src/desktops.c b/src/desktops.c
index 5fa0d7b97..839f37bf1 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -161,9 +161,10 @@ e_desktops_scroll(E_Desktop *desk, int dx, int dy)
 void
 e_desktops_cleanup(E_Desktop *desk)
 {
+   Evas_List l;
    D_ENTER;
 
-   while (desk->windows)
+   for (l = desk->windows; l; l = l->next)
      {
 	E_Border *b;