diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb3da326..f2de3836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 - Rework `/public` Route. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/538))
 ### Tweaks
 - Hide stats DB directory from files tree. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/530))
+- Make it so file tree doesn't reload on upload/delete. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/541))
+- Add upload completed feedback to file upload. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/541))
 - Added further login screen customisation settings. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/531))
 - Set backup filename to use same time as schedule. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/534))
 - Move Schedules to from DB to Queue Datatype. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/535))
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 432276a0..cd7ae4fe 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -966,9 +966,12 @@ class Helpers:
             dpath = os.path.join(folder, filename)
             if os.path.isdir(rel):
                 if filename not in self.ignored_names:
-                    output += f"""<li class="tree-item" data-path="{dpath}">
-                        \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                        <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                    output += f"""<li id="{dpath}li" class="tree-item"
+                        data-path="{dpath}">
+                        \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" 
+                        class="tree-caret tree-ctx-item tree-folder">
+                        <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" 
+                        data-name="{filename}" onclick="getDirView(event)">
                         <i style="color: var(--info);" class="far fa-folder"></i>
                         <i style="color: var(--info);" class="far fa-folder-open"></i>
                         {filename}
@@ -977,7 +980,7 @@ class Helpers:
                         \n"""
             else:
                 if filename not in self.ignored_names:
-                    output += f"""<li
+                    output += f"""<li id="{dpath}li"
                     class="d-block tree-ctx-item tree-file tree-item"
                     data-path="{dpath}"
                     data-name="{filename}"
@@ -1005,9 +1008,12 @@ class Helpers:
             rel = os.path.join(folder, raw_filename)
             if os.path.isdir(rel):
                 if filename not in self.ignored_names:
-                    output += f"""<li class="tree-item" data-path="{dpath}">
-                        \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                        <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
+                    output += f"""<li id="{dpath}li" class="tree-item"
+                        data-path="{dpath}">
+                        \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" 
+                        class="tree-caret tree-ctx-item tree-folder">
+                        <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" 
+                        data-name="{filename}" onclick="getDirView(event)">
                         <i style="color: var(--info);" class="far fa-folder"></i>
                         <i style="color: var(--info);" class="far fa-folder-open"></i>
                         {filename}
@@ -1015,7 +1021,7 @@ class Helpers:
                         </div><li>"""
             else:
                 if filename not in self.ignored_names:
-                    output += f"""<li
+                    output += f"""<li id="{dpath}li"
                     class="d-block tree-ctx-item tree-file tree-item"
                     data-path="{dpath}"
                     data-name="{filename}"
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index af287b43..5734f3a6 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -697,7 +697,7 @@
     });
   }
 
-  function sendFile(file, path, serverId, left, onProgress) {
+  async function sendFile(file, path, serverId, left, i, onProgress) {
     let xmlHttpRequest = new XMLHttpRequest();
     let token = getCookie("_xsrf")
     let fileName = file.name
@@ -719,7 +719,36 @@
       onProgress(Math.floor(event.loaded / event.total * 100)), false);
     xmlHttpRequest.addEventListener('load', (event) => {
       if (event.target.responseText == 'success') {
-        console.log('Upload for file', file.name, 'was successful!')
+        console.log('Upload for file', file.name, 'was successful!');
+        let caught = false;
+        try {
+          var par_el = document.getElementById(path + "ul");
+          var items = par_el.children;
+        } catch {
+          caught = true;
+          var par_el = document.getElementById("files-tree");
+          var items = par_el.children;
+        }
+        let name = file.name;
+        console.log(par_el)
+        let full_path = path + '/' + name
+        let flag = false;
+        for (var k = 0; k < items.length; ++k) {
+          if ($(items[k]).attr("data-name") == name) {
+            flag = true;
+          }
+        }
+        if (!flag) {
+          if (caught) {
+            $(par_el).append('<li id=' + '"' + full_path.toString() + 'li' + '"' + 'class="d-block tree-ctx-item tree-file tree-item" data-path=' + '"' + full_path.toString() + '"' + ' data-name=' + '"' + name.toString() + '"' + ' onclick="clickOnFile(event)" ><span style="margin-right: 6px;"><i class="far fa-file"></i></span>' + name + '</li>');
+          } else {
+            $(par_el).append('<li id=' + '"' + full_path.toString() + 'li' + '"' + 'class="tree-ctx-item tree-file tree-item" data-path=' + '"' + full_path.toString() + '"' + ' data-name=' + '"' + name.toString() + '"' + ' onclick="clickOnFile(event)" ><span style="margin-right: 6px;"><i class="far fa-file"></i></span>' + name + '</li>');
+          }
+          setTreeViewContext();
+        }
+        $(`#upload-progress-bar-${i + 1}`).removeClass("progress-bar-striped");
+        $(`#upload-progress-bar-${i + 1}`).addClass("bg-success");
+        $(`#upload-progress-bar-${i + 1}`).html('<i style="color: black;" class="fas fa-box-check"></i>')
       }
       else {
         alert('Upload failed with response: ' + event.target.responseText);
@@ -735,7 +764,7 @@
   let uploadWaitDialog;
   let doUpload = true;
 
-  function uploadFilesE(event) {
+  async function uploadFilesE(event) {
     path = event.target.parentElement.getAttribute('data-path');
     $(function () {
       var uploadHtml = "<div>" +
@@ -795,7 +824,7 @@
                 `;
                 $('#upload-progress-bar-parent').append(progressHtml);
 
-                sendFile(files.files[i], path, serverId, nFiles - i - 1, (progress) => {
+                await sendFile(files.files[i], path, serverId, nFiles - i - 1, i, (progress) => {
                   $(`#upload-progress-bar-${i + 1}`).attr('aria-valuenow', progress)
                   $(`#upload-progress-bar-${i + 1}`).css('width', progress + '%')
                 });
@@ -996,7 +1025,6 @@
   function hideUploadBox() {
     if (!uploadWaitDialog) return;
     uploadWaitDialog.modal('hide');
-    getTreeView();
   }
 
   function createFileE(event) {
@@ -1074,7 +1102,8 @@
       callback: function (result) {
         if (!result) return;
         deleteFile(path, function () {
-          getTreeView()
+          el = document.getElementById(path + "li");
+          $(el).remove();
           document.getElementById('files-tree-nav').style.display = 'none';
         });
       }
@@ -1102,7 +1131,8 @@
       callback: function (result) {
         if (!result) return;
         deleteDir(path, function () {
-          getTreeView()
+          el = document.getElementById(path + "li");
+          $(el).remove();
           document.getElementById('files-tree-nav').style.display = 'none';
         });
       }