diff --git a/admin-dev/themes/template/stock_cover/list_header.tpl b/admin-dev/themes/template/stock_cover/list_header.tpl
index 50974a529..230cbf076 100644
--- a/admin-dev/themes/template/stock_cover/list_header.tpl
+++ b/admin-dev/themes/template/stock_cover/list_header.tpl
@@ -12,7 +12,7 @@
 				{/foreach}
 			</select>
 	{/if}
-	{if count($stock_cover_warehouses) > 1}
+	{if count($stock_cover_warehouses) > 0}
 			<select name="id_warehouse" onChange="$(this).parent().submit();">
 				{foreach from=$stock_cover_warehouses key=k item=i}
 					<option {if $i.id_warehouse == $stock_cover_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
diff --git a/admin-dev/themes/template/stock_instant_state/list_header.tpl b/admin-dev/themes/template/stock_instant_state/list_header.tpl
index 7eb52d2ed..2a8602aac 100644
--- a/admin-dev/themes/template/stock_instant_state/list_header.tpl
+++ b/admin-dev/themes/template/stock_instant_state/list_header.tpl
@@ -4,7 +4,7 @@
 	<form id="stock_instant_state" type="get">
 		<input type="hidden" name="controller" value="AdminStockInstantState" />
 		<input type="hidden" name="token" value="{$token}" />
-	{if count($stock_instant_state_warehouses) > 1}
+	{if count($stock_instant_state_warehouses) > 0}
 		<div id="stock_instant_state_form_warehouse">
 			<label for="id_warehouse">{l s="Select a warehouse:"}</label>
 			<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
diff --git a/admin-dev/themes/template/stock_mvt/list_header.tpl b/admin-dev/themes/template/stock_mvt/list_header.tpl
index b68fa56f2..2ec06fe54 100644
--- a/admin-dev/themes/template/stock_mvt/list_header.tpl
+++ b/admin-dev/themes/template/stock_mvt/list_header.tpl
@@ -1,6 +1,7 @@
 {extends file="helper/list/list_header.tpl"}
-{block name=leadin}
-	{if count($list_warehouses) > 1}
+{block name=override_header}
+	{if count($list_warehouses) > 0}
+<div class="filter-stock">
 		<form type="get">
 			<label for="id_warehouse">{l s="Select a warehouse:"}</label>
 			<input type="hidden" name="controller" value="AdminStockMvt" />
@@ -12,4 +13,5 @@
 			</select>
 		</form>
 	{/if}
+</div>
 {/block}