diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index d1c919f1f..13f96405a 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -208,7 +208,8 @@ gadman_gadget_place(E_Gadcon_Client *gcc, E_Config_Gadcon_Client *cf, Gadman_Lay
      }
    if (!cc)
      {
-        gc->waiting_classes = eina_list_append(gc->waiting_classes, cf);
+        if (!eina_list_data_find(gc->waiting_classes, cf))
+          gc->waiting_classes = eina_list_append(gc->waiting_classes, cf);
         e_gadcon_custom_populate_request(gc);
         return NULL;
      }