diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2cbea30..7e86c021 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Fix logic issue causing bedrock wizard's root files buttons to not respond to user click events ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/797))
+- Reset crash detection counter after crash detection process detects successful start ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/798))
 ### Tweaks
 TBD
 ### Lang
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 6aec5fc4..b037bbe5 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1053,8 +1053,10 @@ class ServerInstance:
 
         running = self.check_running()
 
-        # if all is okay, we just exit out
+        # if all is okay, we set the restart count to 0 and just exit out
         if running:
+            Console.debug("Successfully found process. Resetting crash counter to 0")
+            self.restart_count = 0
             return
         # check the exit code -- This could be a fix for /stop
         if str(self.process.returncode) in self.settings["ignored_exits"].split(","):
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index e046bcf3..64ae86be 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -498,24 +498,19 @@
 <script src="../../static/assets/js/shared/upload.js"></script>
 <script>
   document.getElementById("root_upload_button").addEventListener("click", function (event) {
-    if (file) {
-      upload = true;
-      if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-        document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir"><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-      } else {
-        document.getElementById('root_upload_button').classList.add('clicked')
-      }
-      const token = getCookie("_xsrf");
-      var dialog = bootbox.dialog({
-        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-        closeButton: false
-      });
-      setTimeout(function () {
-        getDirView();
-      }, 2000);
+    if (document.getElementById('root_upload_button').classList.contains('clicked')) {
+      show_file_tree();
+      return;
     } else {
-      bootbox.alert("You must input a path before selecting this button");
+      document.getElementById('root_upload_button').classList.add('clicked')
     }
+    bootbox.dialog({
+      message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+      closeButton: false
+    });
+    setTimeout(function () {
+      getDirView();
+    }, 2000);
   });
 
   function eula_confirm() {