diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue
index 7a09b5962a..cb94c1f7f1 100644
--- a/web_src/js/components/ViewFileTreeItem.vue
+++ b/web_src/js/components/ViewFileTreeItem.vue
@@ -6,7 +6,7 @@ type Item = {
   name: string;
   path: string;
   htmlUrl: string;
-  isFile: boolean;
+  type: string;
   children?: Item[];
 };
 
@@ -44,7 +44,7 @@ const doLoadFileContent = () => {
 <template>
   <!--title instead of tooltip above as the tooltip needs too much work with the current methods, i.e. not being loaded or staying open for "too long"-->
   <div
-    v-if="item.isFile" class="item-file"
+    v-if="item.type !== 'tree'" class="item-file"
     :class="{'selected': selectedItem.value === item.path}"
     :title="item.name"
     @click.stop="doLoadFileContent"
diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts
index 8e5b918f4c..c0cd8ee359 100644
--- a/web_src/js/features/common-button.ts
+++ b/web_src/js/features/common-button.ts
@@ -162,7 +162,7 @@ export function initTargetButtons(target: ParentNode): void {
   // There are many "cancel button" elements in modal dialogs, Fomantic UI expects they are button-like elements but never submit a form.
   // However, Gitea misuses the modal dialog and put the cancel buttons inside forms, so we must prevent the form submission.
   // There are a few cancel buttons in non-modal forms, and there are some dynamically created forms (eg: the "Edit Issue Content")
-  addDelegatedEventListener(target, 'click', 'form button.ui.cancel.button', (_ /* el */, e) => e.preventDefault());
+  queryElems(target, 'form button.ui.cancel.button', (el) => el.addEventListener('click', (e) => e.preventDefault()));
 
   queryElems(target, '.show-panel', (el) => el.addEventListener('click', onShowPanelClick));
   queryElems(target, '.hide-panel', (el) => el.addEventListener('click', onHidePanelClick));
diff --git a/web_src/js/features/repo-view-file-tree-sidebar.ts b/web_src/js/features/repo-view-file-tree-sidebar.ts
index 569a9abe68..b35724e242 100644
--- a/web_src/js/features/repo-view-file-tree-sidebar.ts
+++ b/web_src/js/features/repo-view-file-tree-sidebar.ts
@@ -37,7 +37,7 @@ async function loadChildren(item, recursive?: boolean) {
   if (json instanceof Array) {
     return json.map((i) => ({
       name: i.name,
-      isFile: i.isFile,
+      type: i.type,
       path: i.path,
       children: i.children,
     }));