diff --git a/Changelog.md b/Changelog.md
index a554b70a2..fed006c81 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@
 ## Bug fixes
 * Fix hiding of poll publisher on close [#5029](https://github.com/diaspora/diaspora/issues/5029)
 * Fix padding in user menu [#5047](https://github.com/diaspora/diaspora/pull/5047)
+* Fix self-XSS when renaming an aspect [#5048](https://github.com/diaspora/diaspora/pull/5048)
 
 ## Features
 
diff --git a/app/assets/javascripts/aspect-edit-pane.js b/app/assets/javascripts/aspect-edit-pane.js
index 61a0bc7f0..feaf196c2 100644
--- a/app/assets/javascripts/aspect-edit-pane.js
+++ b/app/assets/javascripts/aspect-edit-pane.js
@@ -9,11 +9,11 @@ function toggleAspectTitle(){
 }
 
 function updateAspectName(new_name) {
-  $('#aspect_name_title .name').html(new_name);
+  $('#aspect_name_title .name').text(new_name);
   $('input#aspect_name').val(new_name);
 }
 function updatePageAspectName( an_id, new_name) {
-  $('ul#aspect_nav [data-guid="'+an_id+'"]').html(new_name);
+  $('ul#aspect_nav [data-guid="'+an_id+'"]').text(new_name);
 }
 
 $(document).ready(function() {