diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index 503c790e0..f7192bf7e 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -212,17 +212,27 @@ class HelperFormCore extends Helper
 			switch (Shop::getContext())
 			{
 				case Shop::CONTEXT_SHOP :
-					$assos[Shop::getContextShopID()] = Shop::getContextShopID();
+					if ($type == 'shop')
+						$assos[Shop::getContextShopID()] = Shop::getContextShopID();
+					else
+						$assos[Shop::getContextGroupShopID()] = Shop::getContextGroupShopID();
 				break;
 
 				case Shop::CONTEXT_GROUP :
-					foreach (Shop::getShops(false, Shop::getContextGroupShopID(), true) as $id_shop)
-						$assos[$id_shop] = $id_shop;
+					if ($type == 'shop')
+						foreach (Shop::getShops(false, Shop::getContextGroupShopID(), true) as $id_shop)
+							$assos[$id_shop] = $id_shop;
+					else
+						$assos[Shop::getContextGroupShopID()] = Shop::getContextGroupShopID();
 				break;
 
 				default :
-					foreach (Shop::getShops(false, null, true) as $id_shop)
-						$assos[$id_shop] = $id_shop;
+					if ($type == 'shop')
+						foreach (Shop::getShops(false, null, true) as $id_shop)
+							$assos[$id_shop] = $id_shop;
+					else
+						foreach (Shop::getTree() as $group_shop)
+							$assos[$group_shop['id']] = $group_shop['id'];
 				break;
 			}
 		}