diff --git a/admin-dev/themes/template/stock_instant_state/content.tpl b/admin-dev/themes/template/stock_instant_state/content.tpl
index 7a879023f..aca257311 100644
--- a/admin-dev/themes/template/stock_instant_state/content.tpl
+++ b/admin-dev/themes/template/stock_instant_state/content.tpl
@@ -24,11 +24,11 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {if count($list_warehouses) > 1}
-	<form type="get" onchange="submit();">
+	<form type="get">
 		<label for="wareouse">{l s="Select a warehouse:"}</label>
 		<input type="hidden" name="controller" value="AdminStockInstantState" />
 		<input type="hidden" name="token" value="{$token}" />
-		<select name="warehouse">
+		<select name="warehouse" onchange="$(this).parent().submit();">
 			{foreach $list_warehouses as $warehouse}
 				<option {if $warehouse.id_warehouse == $current_warehouse}selected="selected"{/if} value="{$warehouse.id_warehouse}">{$warehouse.name}</option>
 			{/foreach}
diff --git a/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php
index decb4a509..31b3bac5f 100644
--- a/controllers/admin/AdminStockInstantStateController.php
+++ b/controllers/admin/AdminStockInstantStateController.php
@@ -154,6 +154,9 @@ class AdminStockInstantStateControllerCore extends AdminController
 			$warehouse = 1;
 			if ((int)Tools::getValue('warehouse'))
 				$warehouse = (int)Tools::getValue('warehouse');
+			else if ((int)$this->context->cookie->warehouse)
+				$warehouse = (int)$this->context->cookie->warehouse;
+			$this->context->cookie->warehouse = $warehouse;
 		}
 
 		return $warehouse;