diff --git a/admin-dev/themes/default/template/controllers/products/accounting.tpl b/admin-dev/themes/default/template/controllers/products/accounting.tpl
index c6b1d0f5a..08a9ab1d1 100644
--- a/admin-dev/themes/default/template/controllers/products/accounting.tpl
+++ b/admin-dev/themes/default/template/controllers/products/accounting.tpl
@@ -26,13 +26,7 @@
 
 <script type="text/javascript">
 
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
+
 
 </script>
 
diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl
index f57ff6cf8..56caf5d2d 100644
--- a/admin-dev/themes/default/template/controllers/products/associations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/associations.tpl
@@ -24,19 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-
-		searchCategory();
-	});
-
-</script>
-
 <div class="Associations">
 	<h4>{l s='Associations'}</h4>
 	<div class="separation"></div>
diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl
index 544dcaeab..e1c790ad4 100644
--- a/admin-dev/themes/default/template/controllers/products/attachments.tpl
+++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl
@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($obj->id)}
 
 	<h4>{l s='Attachment'}</h4>
diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index 934dd6119..219932330 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -25,15 +25,6 @@
 *}
 
 <script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
 	{if $product->is_virtual}
 		$('#virtual_good_attributes').show();
 	{else}
diff --git a/admin-dev/themes/default/template/controllers/products/customization.tpl b/admin-dev/themes/default/template/controllers/products/customization.tpl
index dc9066571..c480ac017 100644
--- a/admin-dev/themes/default/template/controllers/products/customization.tpl
+++ b/admin-dev/themes/default/template/controllers/products/customization.tpl
@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($obj->id)}
 	<h4>{l s='Add or modify customizable properties'}</h4>
 	
diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl
index 78adeabfe..fa47108c3 100644
--- a/admin-dev/themes/default/template/controllers/products/features.tpl
+++ b/admin-dev/themes/default/template/controllers/products/features.tpl
@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($product->id)}
 	
 	<h4>{l s='Assign features to this product:'}</h4>
diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index f1b7b6240..20b5d12a6 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($id_product) && isset($product)}
 	<h4 class="tab" >2. {l s='Images'} (<span id="countImage">{$countImages}</span>)</h4>
 	<h4>{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}</h4>	<div class="separation"></div><br />
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index da0312f9b..56844c2fe 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -24,17 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null;
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 <div id="step1">
 	<h4 class="tab">1. {l s='Info.'}</h4>
 	<h4>{l s='Product global information'}</h4>
diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl
index 9e445d57f..74998d041 100644
--- a/admin-dev/themes/default/template/controllers/products/pack.tpl
+++ b/admin-dev/themes/default/template/controllers/products/pack.tpl
@@ -30,13 +30,6 @@
 	var msg_set_quantity = '{l s='Thanks to set a quantity to add a product.' js=1}';
 
 	$(document).ready(function() {
-
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-
 		if ($('#ppack').attr('checked'))
 		{
 			$('#ppack').attr('disabled', 'disabled');
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index 2dce874fb..578e14792 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -104,18 +104,6 @@ jQuery(document).ready(Customer.init);
 {/literal}
 {* END CUSTOMER AUTO-COMPLETE / TO REFACTO *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 <div class="block_specific_prices_modifications">
 	<h4>{l s='Product price'}</h4>
     <div class="hint" style="display:block;min-height:0;">
diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl
index 5fa92dec5..42c4c7102 100644
--- a/admin-dev/themes/default/template/controllers/products/quantities.tpl
+++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl
@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 {if isset($product->id)}
 
 	<h4>{l s='Available quantities for sale'}</h4>
diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index f1c8ba85e..42cbc948a 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -24,21 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-
-		// Enable product name field when the url rewrite field is loaded
-		$('.copy2friendlyUrl').removeAttr('disabled');
-	});
-
-</script>
-
 <h4>{l s='SEO'}</h4>
 <div class="separation"></div>
 
diff --git a/admin-dev/themes/default/template/controllers/products/shipping.tpl b/admin-dev/themes/default/template/controllers/products/shipping.tpl
index f8c9de649..c4e8d4f90 100644
--- a/admin-dev/themes/default/template/controllers/products/shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl
@@ -24,18 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
-
 <h4 class="tab">1. {l s='Info.'}</h4>
 <h4>{l s='Shipping'}</h4>
 
diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
index d4db5e6b8..91133c129 100644
--- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl
+++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
@@ -24,17 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null;
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
 <input type="hidden" name="supplier_loaded" value="1">
 {if isset($product->id)}
 
diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index ec1bccc23..3d4aa1c4e 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -66,14 +66,6 @@
 		}
 	});
 
-	$(document).ready(function() {
-		$('input').keypress(function(e) { 
-			var code = null; 
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
 	function uploadFile()
 	{
 		$.ajaxFileUpload (
diff --git a/admin-dev/themes/default/template/controllers/products/warehouses.tpl b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
index 58cc1484b..763806f95 100644
--- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl
+++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
@@ -24,17 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-
-	$(document).ready(function() {
-		$('input').keypress(function(e) {
-			var code = null;
-			code = (e.keyCode ? e.keyCode : e.which);
-			return (code == 13) ? false : true;
-		});
-	});
-
-</script>
 <input type="hidden" name="warehouse_loaded" value="1">
 {if isset($product->id)}
 
diff --git a/js/admin-products.js b/js/admin-products.js
index d88886486..0bef27079 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -341,4 +341,11 @@ urlToCall = null;
 $(document).ready(function() {
 	updateCurrentText();
 	updateFriendlyURL();
+
+	// Pressing enter in an input field should not submit the form
+	$('#product_form').delegate('input', 'keypress', function(e){
+			var code = null;
+		code = (e.keyCode ? e.keyCode : e.which);
+		return (code == 13) ? false : true;
+	});
 });