diff --git a/src/js/control-view.js b/src/js/control-view.js
index 88c7e4f..f54dced 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -635,24 +635,29 @@ module.exports = {
         return;
       }
 
+      this.config.gcode_list = [...this.state.gcode_list];
+      this.config.non_macros_list = [...this.state.non_macros_list];
+
       if (this.state.folder != "default") {
-        this.config.gcode_list = [...this.state.gcode_list];
         const selected_folder = this.config.gcode_list.find(
           item => item.type == "folder" && item.name == this.state.folder,
         ).files;
         if (selected_folder) {
-          const files_to_delete = selected_folder.map(item => item.file_name).toString();
-          await api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${files_to_delete}`);
+          var files_to_delete = selected_folder.map(item => item.file_name);
           this.config.gcode_list = this.config.gcode_list.filter(item => item.name != this.state.folder);
         }
       } else {
         const selected_folder = this.config.gcode_list.filter(item => item.type == "file");
         if (selected_folder) {
-          const files_to_delete = selected_folder.map(item => item.name).toString();
-          await api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${files_to_delete}`);
+          var files_to_delete = selected_folder.map(item => item.name);
           this.config.gcode_list = this.config.gcode_list.filter(item => item.type != "file");
         }
       }
+      
+      await api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${files_to_delete.toString()}`);
+      this.config.non_macros_list = this.config.non_macros_list.filter(
+        item => !files_to_delete.includes(item.file_name),
+      );
       this.save_config(this.config);
       this.state.folder = "default";
       this.confirmDelete = false;
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 88b1a4b..ddf8731 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -317,6 +317,9 @@ script#control-view-template(type="text/x-template")
               button.pure-button.button-success(@click="delete_current")
                 .fa.fa-trash
                 |  Selected
+          
+          button.submit-macros(title="Cancel Macros",@click="print_config",style="margin-left:5px;background-color:#fafafa;") CONFIG
+          button.submit-macros(title="Cancel Macros",@click="print_state",style="margin-left:5px;background-color:#fafafa;") STATE
 
           .drop-down-container
             message(:show.sync="create_folder")
@@ -367,9 +370,6 @@ script#control-view-template(type="text/x-template")
             //-   :disabled="!is_ready")
             //-   | Upload File
 
-            button.submit-macros(title="Cancel Macros",@click="print_config",style="margin-left:5px;background-color:#fafafa;") CONFIG
-            button.submit-macros(title="Cancel Macros",@click="print_state",style="margin-left:5px;background-color:#fafafa;") STATE
-
           .progress(v-if="toolpath_progress && toolpath_progress < 1",
             title="Simulating GCode to check for errors, calculate ETA and " +
               "generate 3D view.  You can run GCode before the simulation " +