diff --git a/admin-dev/themes/default/template/controllers/products/shipping.tpl b/admin-dev/themes/default/template/controllers/products/shipping.tpl
index 122baca91..d0122d172 100644
--- a/admin-dev/themes/default/template/controllers/products/shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl
@@ -81,26 +81,31 @@
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-5" for="carriers_restriction">
-		<span class="label-tooltip" data-toggle="tooltip"
-			title="{l s='If no carrier selected, all carriers can be used to ship this product.'}">
-			{l s='Carriers:'}
-		</span>
-		
-	</label>
-	<div class="col-lg-3">
-		<select name="carriers[]" id="carriers_restriction" multiple="multiple">
-			{foreach $carrier_list as $carrier}
-				<option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option>
-			{/foreach}
-		</select>
-		<button class="btn btn-default" onclick="unselectAllCarriers(); return false;">{l s='Unselect all'}</button>
+	<label class="control-label col-lg-5" for="availableCarriers">{l s='Carriers:'}</label>
+	<div class="input-group col-lg-7">
+		<div class="row">
+			<div class="col-lg-6">
+				<label for="availableCarriers">{l s='Available carriers'}</label>
+				<select multiple id="availableCarriers" name="availableCarriers">
+					{foreach $carrier_list as $carrier}
+						{if !isset($carrier.selected) || !$carrier.selected}
+							<option value="{$carrier.id_reference}">{$carrier.name}</option>
+						{/if}
+					{/foreach}
+				</select>
+				<a href="#" id="addCarrier" class="btn btn-default btn-block">{l s='Add'} <i class="icon-arrow-right"></i></a>
+			</div>
+			<div class="col-lg-6">
+				<label for="selectedCarriers">{l s='Selected carriers'}</label>
+				<select multiple id="selectedCarriers" name="selectedCarriers[]">
+					{foreach $carrier_list as $carrier}
+						{if isset($carrier.selected) && $carrier.selected}
+							<option value="{$carrier.id_reference}">{$carrier.name}</option>
+						{/if}
+					{/foreach}
+				</select>
+				<a href="#" id="removeCarrier" class="btn btn-default btn-block"><i class="icon-arrow-left"></i> {l s='Remove'}</a>
+			</div>
+		</div>
 	</div>
-</div>
-
-<script>
-	function unselectAllCarriers()
-	{ $('#carriers_restriction option').each(function () { $(this).removeAttr('selected')});
-		return false;
-	}
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 362a92562..4bd25af78 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3603,8 +3603,9 @@ class AdminProductsControllerCore extends AdminController
 		{
 			$carriers = array();
 			
-			if (Tools::getValue('carriers'))
-				$carriers = Tools::getValue('carriers');
+			if (Tools::getValue('selectedCarriers'))
+				$carriers = Tools::getValue('selectedCarriers');
+
 			$product->setCarriers($carriers);
 		}
 	}
diff --git a/js/admin-products.js b/js/admin-products.js
index b148f7734..ef33ae927 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -760,6 +760,32 @@ product_tabs['Attachments'] = new function(){
 	};
 }
 
+product_tabs['Shipping'] = new function(){
+	var self = this;
+
+	this.bindCarriersEvents = function (){
+		$("#addCarrier").live('click', function() {
+			$('#availableCarriers option:selected').each( function() {
+	                $('#selectedCarriers').append("<option value='"+$(this).val()+"'>"+$(this).text()+"</option>");
+	            $(this).remove();
+	        });
+	        $('#selectedCarriers option').prop('selected', true);
+		});
+
+		$("#removeCarrier").live('click', function() {
+			$('#selectedCarriers option:selected').each( function() {
+	            $('#availableCarriers').append("<option value='"+$(this).val()+"'>"+$(this).text()+"</option>");
+	            $(this).remove();
+	        });
+			$('#selectedCarriers option').prop('selected', true);
+		});
+	};
+
+	this.onReady = function(){
+		self.bindCarriersEvents();
+	};
+}
+
 product_tabs['Informations'] = new function(){
 	var self = this;
 	this.bindAvailableForOrder = function (){