diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 8b230b112b2..5908e4eb684 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -2106,7 +2106,7 @@ static BOOL cleanup_associations(void)
     {
         int i;
         BOOL done = FALSE;
-        for (i = 0; !done; i++)
+        for (i = 0; !done;)
         {
             WCHAR *extensionW = NULL;
             DWORD size = 1024;
@@ -2142,6 +2142,8 @@ static BOOL cleanup_associations(void)
                     hasChanged = TRUE;
                     HeapFree(GetProcessHeap(), 0, desktopFile);
                 }
+                else
+                    i++;
                 HeapFree(GetProcessHeap(), 0, command);
             }
             else