diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php
index 3ece1f322..d2a128fad 100755
--- a/controllers/admin/AdminShopController.php
+++ b/controllers/admin/AdminShopController.php
@@ -431,9 +431,12 @@ class AdminShopControllerCore extends AdminController
 			);
 
 		$this->fields_value = array(
-			'id_group_shop' => (isset($obj->id_group_shop)) ? $obj->id_group_shop : Shop::getContextGroupShopID(),
-			'active' => true,
-			'id_theme_checked' => isset($obj->id_theme) ? $obj->id_theme : $id_theme
+            'id_group_shop' => (Tools::getValue('id_group_shop') ? Tools::getValue('id_group_shop') :
+                (isset($obj->id_group_shop)) ? $obj->id_group_shop : Shop::getContextGroupShopID()),
+            'id_category' => (Tools::getValue('id_category') ? Tools::getValue('id_category') :
+                (isset($obj->id_group_shop)) ? $obj->id_group_shop : Shop::getContextGroupShopID()),
+			'active' => (Tools::getValue('active') ? true : false),
+			'id_theme_checked' => (isset($obj->id_theme) ? $obj->id_theme : $id_theme)
 		);
 
 		$this->tpl_form_vars = array(
@@ -490,7 +493,10 @@ class AdminShopControllerCore extends AdminController
 
 		$this->errors = array_unique($this->errors);
 		if (count($this->errors) > 0)
-			return;
+        {
+            $this->display = 'add';
+            return;
+        }
 
 		// datas to import
 		$import_data = Tools::getValue('importData');
diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php
index 60fb3da5e..9de5af513 100644
--- a/controllers/admin/AdminStoresController.php
+++ b/controllers/admin/AdminStoresController.php
@@ -196,7 +196,8 @@ class AdminStoresControllerCore extends AdminController
 					'required' => true,
 					'options' => array(
 						'id' => 'id_state',
-						'name' => 'name'
+						'name' => 'name',
+                        'query' => null
 					)
 				),
 				array(
@@ -369,6 +370,8 @@ class AdminStoresControllerCore extends AdminController
 
 		if (!count($this->errors))
 			parent::postProcess();
+        else
+            $this->display = 'add';
 	}
 
 	protected function postImage($id)