diff --git a/admin-dev/themes/default/template/helpers/form/form_category.tpl b/admin-dev/themes/default/template/helpers/form/form_category.tpl
index 55452b132..d7c255ccf 100644
--- a/admin-dev/themes/default/template/helpers/form/form_category.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form_category.tpl
@@ -24,11 +24,11 @@
 *}
 {if count($categories) && isset($categories)}
 	<script type="text/javascript">
-		var inputName = '{$categories.input_name}';
+		var inputName = '{$categories.input_name|@addcslashes:'\''}';
 		var use_radio = {if $categories.use_radio}1{else}0{/if};
-		var selectedCat = '{implode value=$categories.selected_cat}';
-		var selectedLabel = '{$categories.trads.selected}';
-		var home = '{$categories.trads.Root.name}';
+		var selectedCat = {$categories.selected_cat|@implode|intval};
+		var selectedLabel = '{$categories.trads.selected|@addcslashes:'\''}';
+		var home = '{$categories.trads.Root.name|@addcslashes:'\''}';
 		var use_radio = {if $categories.use_radio}1{else}0{/if};
 		var use_context = {if isset($categories.use_context)}1{else}0{/if};
 		$(document).ready(function(){
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index 123974da1..475607385 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -213,20 +213,18 @@ class HelperCore
 
 		$html = '
 		<script type="text/javascript">
-			var inputName = "'.$input_name.'";
-		';
+			var inputName = \''.addcslashes($input_name, '\'').'\';'."\n";
 		if (count($selected_cat) > 0)
 		{
 			if (isset($selected_cat[0]))
-				$html .= 'var selectedCat = "'.implode(',', $selected_cat).'";';
+				$html .= '			var selectedCat = '.(int)implode(',', $selected_cat).';'."\n";
 			else
-				$html .= 'var selectedCat = "'.implode(',', array_keys($selected_cat)).'";';
+				$html .= '			var selectedCat = '.(int)implode(',', array_keys($selected_cat)).';'."\n";
 		}
 		else
-			$html .= 'var selectedCat = "";';
-		$html .= '
-			var selectedLabel = \''.$translations['selected'].'\';
-			var home = \''.$root['name'].'\';
+			$html .= '			var selectedCat = \'\';'."\n";
+		$html .= '			var selectedLabel = \''.$translations['selected'].'\';
+			var home = \''.addcslashes($root['name'], '\'').'\';
 			var use_radio = '.(int)$use_radio.';';
 		if (!$use_in_popup)
 			$html .= '