diff --git a/templates/skin/developer/actions/ActionTag/index.tpl b/templates/skin/developer/actions/ActionTag/index.tpl
index 470e3c49..ca2d800f 100644
--- a/templates/skin/developer/actions/ActionTag/index.tpl
+++ b/templates/skin/developer/actions/ActionTag/index.tpl
@@ -4,7 +4,7 @@
 {literal}
 <script>
 function submitTags(sTag) {		
-	window.location=DIR_WEB_ROOT+'/tag/'+sTag+'/';
+	window.location=DIR_WEB_ROOT+'/tag/'+encodeURIComponent(sTag)+'/';
 	return false;
 }
 </script>
diff --git a/templates/skin/new/actions/ActionTag/index.tpl b/templates/skin/new/actions/ActionTag/index.tpl
index ccbc6f72..b1d8d72d 100644
--- a/templates/skin/new/actions/ActionTag/index.tpl
+++ b/templates/skin/new/actions/ActionTag/index.tpl
@@ -3,7 +3,7 @@
 {literal}
 <script>
 function submitTags(sTag) {		
-	window.location=DIR_WEB_ROOT+'/tag/'+sTag+'/';
+	window.location=DIR_WEB_ROOT+'/tag/'+encodeURIComponent(sTag)+'/';
 	return false;
 }
 </script>