diff --git a/src/js/control-view.js b/src/js/control-view.js
index a97c2fd..868c585 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -636,6 +636,7 @@ module.exports = {
       ];
 
       this.save_config(this.config);
+      this.state.folder = "default";
       this.deleteGCode = false;
     },
 
diff --git a/src/js/macros.js b/src/js/macros.js
index a4f0257..a3ee6b7 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -390,7 +390,11 @@ module.exports = {
           alert: true,
         },
       ];
-      const macros_list = this.state.macros_list.map(item => item.file_name).toString();
+      const non_macros_list = this.state.non_macros_list.map(item => item.file_name);
+      const macros_list = this.state.macros_list
+        .filter(item => !non_macros_list.includes(item.file_name))
+        .map(item => item.file_name)
+        .toString();
       api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${macros_list}`);
       this.config.macros_list = [];
       this.edited = false;