diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 0f1458bfbfd22..53ea4fd2e3918 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -167,8 +167,8 @@
 								<button class="btn diff-header-popup-btn tw-p-1">{{svg "octicon-kebab-horizontal" 18}}</button>
 								<div class="tippy-target">
 									{{if not (or $file.IsIncomplete $file.IsBin $file.IsSubmodule)}}
-										<button class="unescape-button item" data-file-content-elem-id="diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</button>
-										<button class="escape-button tw-hidden item" data-file-content-elem-id="diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
+										<button class="unescape-button item" data-unicode-content-selector="#diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</button>
+										<button class="escape-button tw-hidden item" data-unicode-content-selector="#diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
 									{{end}}
 									{{if and (not $file.IsSubmodule) (not $.PageIsWiki)}}
 										{{if $file.IsDeleted}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 2bb0a4f006888..843a977e3e57c 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -44,13 +44,13 @@
 				</div>
 				<div class="repo-button-row">
 					{{if .EscapeStatus.Escaped}}
-						<a class="ui small button unescape-button tw-m-0 tw-hidden">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</a>
-						<a class="ui small button escape-button tw-m-0">{{ctx.Locale.Tr "repo.escape_control_characters"}}</a>
+						<a class="ui small button unescape-button tw-hidden" data-unicode-content-selector=".wiki-content-parts">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</a>
+						<a class="ui small button escape-button" data-unicode-content-selector=".wiki-content-parts">{{ctx.Locale.Tr "repo.escape_control_characters"}}</a>
 					{{end}}
 					{{if and .CanWriteWiki (not .Repository.IsMirror)}}
 						<a class="ui small button" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_edit">{{ctx.Locale.Tr "repo.wiki.edit_page_button"}}</a>
 						<a class="ui small primary button" href="{{.RepoLink}}/wiki?action=_new">{{ctx.Locale.Tr "repo.wiki.new_page_button"}}</a>
-						<a class="ui small red button tw-m-0 delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete" data-id="{{.PageURL}}">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
+						<a class="ui small red button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete" data-id="{{.PageURL}}">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
 					{{end}}
 				</div>
 			</div>
diff --git a/web_src/js/features/repo-unicode-escape.ts b/web_src/js/features/repo-unicode-escape.ts
index 0c7d2e8592aa0..38cad1f753826 100644
--- a/web_src/js/features/repo-unicode-escape.ts
+++ b/web_src/js/features/repo-unicode-escape.ts
@@ -1,27 +1,28 @@
 import {addDelegatedEventListener, hideElem, queryElemSiblings, showElem, toggleElem} from '../utils/dom.ts';
 
 export function initUnicodeEscapeButton() {
+  // buttons might appear on these pages: file view (code, rendered markdown), diff (commit, pr conversation, pr diff), blame, wiki
   addDelegatedEventListener(document, 'click', '.escape-button, .unescape-button, .toggle-escape-button', (btn, e) => {
     e.preventDefault();
 
-    const fileContentElemId = btn.getAttribute('data-file-content-elem-id');
-    const fileContent = fileContentElemId ?
-      document.querySelector(`#${fileContentElemId}`) :
+    const unicodeContentSelector = btn.getAttribute('data-unicode-content-selector');
+    const container = unicodeContentSelector ?
+      document.querySelector(unicodeContentSelector) :
       btn.closest('.file-content, .non-diff-file-content');
-    const fileView = fileContent?.querySelectorAll('.file-code, .file-view');
+    const fileView = container.querySelector('.file-code, .file-view') || container;
     if (btn.matches('.escape-button')) {
-      for (const el of fileView) el.classList.add('unicode-escaped');
+      fileView.classList.add('unicode-escaped');
       hideElem(btn);
       showElem(queryElemSiblings(btn, '.unescape-button'));
     } else if (btn.matches('.unescape-button')) {
-      for (const el of fileView) el.classList.remove('unicode-escaped');
+      fileView.classList.remove('unicode-escaped');
       hideElem(btn);
       showElem(queryElemSiblings(btn, '.escape-button'));
     } else if (btn.matches('.toggle-escape-button')) {
-      const isEscaped = fileView[0]?.classList.contains('unicode-escaped');
-      for (const el of fileView) el.classList.toggle('unicode-escaped', !isEscaped);
-      toggleElem(fileContent.querySelectorAll('.unescape-button'), !isEscaped);
-      toggleElem(fileContent.querySelectorAll('.escape-button'), isEscaped);
+      const isEscaped = fileView.classList.contains('unicode-escaped');
+      fileView.classList.toggle('unicode-escaped', !isEscaped);
+      toggleElem(container.querySelectorAll('.unescape-button'), !isEscaped);
+      toggleElem(container.querySelectorAll('.escape-button'), isEscaped);
     }
   });
 }