diff --git a/src/js/control-view.js b/src/js/control-view.js
index 9e154dc..a97c2fd 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -606,16 +606,11 @@ module.exports = {
       this.update_config();
 
       this.config.non_macros_list = this.config.non_macros_list.filter(item => item.file_name != this.state.selected);
-      // if (this.state.folder == "default") {
-      //   this.config.gcode_list = this.config.gcode_list.filter(
-      //     item => (item.type == "file" || item.type == "folder") && item.name != this.state.selected,
-      //   );
-      // } else {
       const file_to_delete = this.config.gcode_list.find(
         item => item.name == this.state.folder && item.type == "folder",
       );
       file_to_delete.files = file_to_delete.files.filter(item => item.file_name != this.state.selected);
-      // }
+
       if (!this.state.macros_list.find(item => item.file_name == this.state.selected)) {
         api.delete(`file/${this.state.selected}`);
       }
diff --git a/src/js/macros.js b/src/js/macros.js
index 6e48c81..a4f0257 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -238,6 +238,7 @@ module.exports = {
       }
 
       this.update_config();
+      const macros = [...this.state.macros];
 
       macros.splice(this.tab - 1, 1);
       const macros_list = macros.map(item => item.name);
@@ -305,7 +306,9 @@ module.exports = {
             item.file_name = "default";
           });
         }
-        api.delete(`file/${filename}`);
+        if (!this.state.non_macros_list.find(item => item.file_name == filename)) {
+          api.delete(`file/${filename}`);
+        }
         this.newGcode = "";
         this.config.macros_list = this.config.macros_list.filter(item => item.file_name !== filename);
         this.fileName = "default";