diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index 9da1bb0cb..99f687ea1 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -529,8 +529,8 @@ class AdminAttributesGroupsControllerCore extends AdminController
 		else
 			$this->identifier = 'id_attribute';
 
-		if ((int)Tools::getValue('id_attribute_group') <= 0 && $this->display == 'add'
-			|| (int)Tools::getValue('id_attribute') <= 0 && $this->display != 'add')
+		if ((int)Tools::getValue('id_attribute_group') >= 0 && ($this->display == 'add' || $this->display == 'editAttributes')
+			|| (int)Tools::getValue('id_attribute_group') == 0 && $this->display != 'add')
 			return $this->processAdd($token);
 		else
 			return $this->processUpdate($token);