diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 26238f1101..c6da11cd88 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -155,12 +155,6 @@ define('admin/manage/category', [
 		} else {
 			$('a[href="#analytics"]').on('shown.bs.tab', Category.setupGraphs);
 		}
-
-		// Fix the input field for the category name, as it can contain a translation key
-		var nameInput = $('#cid-' + ajaxify.data.cid + '-name');
-		if (ajaxify.data.category.name !== nameInput.val()) {
-			$('#cid-' + ajaxify.data.category.cid + '-name').val(ajaxify.data.category.name);
-		}
 	};
 
 	Category.setupPrivilegeTable = function() {
diff --git a/src/controllers/admin/categories.js b/src/controllers/admin/categories.js
index 704dc21a2c..31bd44bd49 100644
--- a/src/controllers/admin/categories.js
+++ b/src/controllers/admin/categories.js
@@ -1,11 +1,12 @@
 "use strict";
 
-var async = require('async'),
-	
-	categories = require('../../categories'),
-	privileges = require('../../privileges'),
-	analytics = require('../../analytics'),
-	plugins = require('../../plugins');
+var async = require('async');
+
+var categories = require('../../categories');
+var privileges = require('../../privileges');
+var analytics = require('../../analytics');
+var plugins = require('../../plugins');
+var translator = require('../../../public/src/modules/translator')
 
 
 var categoriesController = {};
@@ -24,7 +25,7 @@ categoriesController.get = function(req, res, next) {
 			if (err) {
 				return next(err);
 			}
-
+			data.category.name = translator.escape(data.category.name);
 			res.render('admin/manage/category', {
 				category: data.category,
 				privileges: data.privileges,