diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb
index 80813d5f..dc8c4455 100644
--- a/app/assets/javascripts/tracks.js.erb
+++ b/app/assets/javascripts/tracks.js.erb
@@ -527,6 +527,10 @@ var ProjectListPage = {
     setup_behavior: function() {
         /* in-place edit of project name */
         $('span#project_name').editable(ProjectListPage.save_project_name, {
+            data:function(encoded, config){
+              var decoded = $('<p></p>').html(encoded).text();
+              return decoded; 
+            },
             style: 'padding: 0px; width=100%;',
             submit: i18n['common.ok'],
             cancel: i18n['common.cancel'],
@@ -657,6 +661,10 @@ var ContextListPage = {
     setup_behavior: function() {
         /* in place edit of context name */
         $('div.context span#context_name').editable(ContextListPage.save_context_name, {
+            data:function(encoded, config){
+              var decoded = $('<p></p>').html(encoded).text();
+              return decoded;
+            },
             style: 'padding:0px',
             submit: i18n['common.ok'],
             cancel: i18n['common.cancel']
diff --git a/app/views/projects/update_project_name.js.erb b/app/views/projects/update_project_name.js.erb
index 0f232804..51700425 100644
--- a/app/views/projects/update_project_name.js.erb
+++ b/app/views/projects/update_project_name.js.erb
@@ -1,4 +1,4 @@
 <% if @saved -%>
   TracksPages.page_inform('<%=t('projects.status_project_name_changed')%>');
-  TracksForm.set_project_name_and_default_project_name("<%= escape_javascript(@project.name)%>");
-<% end %>
\ No newline at end of file
+  TracksForm.set_project_name_and_default_project_name("<%= escape_javascript(@project.name).html_safe%>");
+<% end %>