diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl
index 009f745cf..c179ae157 100755
--- a/admin-dev/themes/template/orders/view.tpl
+++ b/admin-dev/themes/template/orders/view.tpl
@@ -32,12 +32,15 @@
 			$('#warehouse').show();
 		{/literal}{/if}{literal}
 	}
-
+	
 	function hideWarehouseList()
 	{
 		$('#warehouse').hide();
 	}
-	hideWarehouseList();
+	$(document).ready(function()
+	{
+		hideWarehouseList();
+	});
 {/literal}
 </script>
 
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 5a3a97282..5d0927993 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -503,7 +503,7 @@ class AdminOrdersControllerCore extends AdminController
 			'carrier' => $carrier = new Carrier($order->id_carrier),
 			'history' => $order->getHistory($this->context->language->id),
 			'states' => OrderState::getOrderStates($this->context->language->id),
-			'warehouse_list' => Warehouse::getWarehouseList(),
+			'warehouse_list' => Warehouse::getWarehouseList(false, $order->id_shop),
 			'sources' => ConnectionsSource::getOrderSources($order->id),
 			'currentState' => OrderHistory::getLastOrderState($order->id),
 			'currency' => new Currency($order->id_currency),