diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index b7be36d576..5ea68dba08 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -1,5 +1,5 @@
 "use strict";
-/* global define, app, ajaxify, socket, templates, bootbox */
+/* global define, app, ajaxify, socket, templates */
 
 define('admin/general/navigation', ['translator', 'iconSelect'], function(translator, iconSelect) {
 	var navigation = {},
@@ -8,9 +8,9 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 	navigation.init = function() {
 		available = ajaxify.data.available;
 
-		$('#enabled').html(translator.unescape($('#enabled').html()));
-
-		$('#active-navigation').html(translator.unescape($('#active-navigation').html()));
+		$('#enabled .unescape').each(function() {
+			$(this).val(translator.unescape($(this).val()));
+		});
 
 		translator.translate(translator.unescape($('#available').html()), function(html) {
 			$('#available').html(html)
diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl
index 826960e569..16775ef9ac 100644
--- a/src/views/admin/general/navigation.tpl
+++ b/src/views/admin/general/navigation.tpl
@@ -42,14 +42,14 @@
 
 							<div class="form-group">
 								<label>Tooltip:</label>
-								<input class="form-control" type="text" name="title" value="{enabled.title}" />
+								<input class="form-control unescape" type="text" name="title" value="{enabled.title}" />
 							</div>
 						</div>
 
 						<div class="col-sm-6">
 							<div class="form-group">
 								<label>Text:</label>
-								<input class="form-control" type="text" name="text" value="{enabled.text}" />
+								<input class="form-control unescape" type="text" name="text" value="{enabled.text}" />
 							</div>
 
 							<div class="form-group">