diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index b07c3ba4d..6bbc59090 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -444,17 +444,6 @@
 				<div class="translatable-field lang-{$language.id_lang}">
 					<div class="col-lg-9">
 				{/if}
-				{literal}
-					<script type="text/javascript">
-						$().ready(function () {
-							var input_id = '{/literal}tags_{$language.id_lang}{literal}';
-							$('#'+input_id).tagify({delimiters: [13,44], addTagPrompt: '{/literal}{l s='Add tag' js=1}{literal}'});
-							$({/literal}'#{$table}{literal}_form').submit( function() {
-								$(this).find('#'+input_id).val($('#'+input_id).tagify('serialize'));
-							});
-						});
-					</script>
-				{/literal}
 						<input type="text" id="tags_{$language.id_lang}" class="tagify updateCurrentText" name="tags_{$language.id_lang}" value="{$product->getTags($language.id_lang, true)|htmlentitiesUTF8}" />
 				{if $languages|count > 1}
 					</div>
diff --git a/admin-dev/themes/default/template/footer_toolbar.tpl b/admin-dev/themes/default/template/footer_toolbar.tpl
index b1537076f..bae785f6b 100644
--- a/admin-dev/themes/default/template/footer_toolbar.tpl
+++ b/admin-dev/themes/default/template/footer_toolbar.tpl
@@ -69,7 +69,7 @@
 				btn_submit.hide();
 				//bind enter key press to validate form
 				$('#{$table}_form').find('input').keypress(function (e) {
-					if (e.which == 13 && e.target.localName != 'textarea' && !e.target.hasClass('tagify'))
+					if (e.which == 13 && e.target.localName != 'textarea' && !$(e.target).parent().hasClass('tagify-container'))
 						$('#desc-{$table}-save').click();
 				});
 				//submit the form
diff --git a/admin-dev/themes/default/template/page_header_toolbar.tpl b/admin-dev/themes/default/template/page_header_toolbar.tpl
index 285de5c64..722fe23a8 100644
--- a/admin-dev/themes/default/template/page_header_toolbar.tpl
+++ b/admin-dev/themes/default/template/page_header_toolbar.tpl
@@ -89,7 +89,7 @@
 						btn_submit.hide();
 						//bind enter key press to validate form
 						$('#{$table}_form').find('input').keypress(function (e) {
-							if (e.which == 13 && e.target.localName != 'textarea' && !e.target.hasClass('tagify'))
+							if (e.which == 13 && e.target.localName != 'textarea' && !$(e.target).parent().hasClass('tagify-container'))
 								$('#page-header-desc-{$table}-save').click();
 						});
 						//submit the form