diff --git a/src/js/macros.js b/src/js/macros.js
index a119d4d..299ef82 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -18,6 +18,8 @@ module.exports = {
       edited: false,
       addMacros: false,
       maxLimitReached: false,
+      macroFound: false,
+      GCodeNotFound: false,
       macrosName: "",
       isChecked: false,
       fileName: "default",
@@ -111,6 +113,8 @@ module.exports = {
         if (response.status == 200) {
           const text = await response.text();
           this.newGcode = text;
+        } else if (response.status == 400) {
+          return (this.GCodeNotFound = true);
         } else {
           console.error("error loading");
         }
@@ -121,6 +125,16 @@ module.exports = {
         this.$dispatch("macros-edited");
       }
     },
+    removeFromList: async function () {
+      this.config.macros_list = this.config.macros_list.filter(item => item.file_name != this.fileName);
+      try {
+        await api.put("config/save", this.config);
+        this.$dispatch("update");
+      } catch (error) {
+        console.error("Restore Failed: ", error);
+        alert("Restore failed");
+      }
+    },
     upload: async function (e) {
       const files = e.target.files || e.dataTransfer.files;
       if (!files.length) {
@@ -203,9 +217,10 @@ module.exports = {
       const macros = [...this.config.macros];
       macros.splice(this.tab - 1, 1);
       const macros_list = macros.map(item => item.name);
+      var macrosName = document.getElementById(`macros-name`).value;
       var macrosColor = document.getElementById("macros-color").value;
       var macrosAlert = this.isChecked;
-      const formattedFilename = this.macrosName
+      const formattedFilename = macrosName
         .replace(/\\/g, "_")
         .replace(/\//g, "_")
         .replace(/#/g, "-")
@@ -224,7 +239,7 @@ module.exports = {
         this.upload_gcode(file_name, file);
       }
 
-      this.config.macros[this.tab - 1].name = this.macrosName;
+      this.config.macros[this.tab - 1].name = macrosName;
       this.config.macros[this.tab - 1].color = macrosColor;
       this.config.macros[this.tab - 1].file_name = file_name;
       this.config.macros[this.tab - 1].alert = macrosAlert;
@@ -239,14 +254,27 @@ module.exports = {
       }
       this.edited = false;
     },
+    check_gcode_with_macro: function () {
+      const macro_with_filename = this.config.macros.find(item => item.file_name == this.fileName);
+      if (macro_with_filename) {
+        this.deleteGCode = false;
+        this.macroFound = true;
+      } else {
+        this.delete_current();
+      }
+    },
     delete_current: async function () {
       const filename = this.fileName;
+      const macro_with_filename = this.config.macros.filter(item => item.file_name == this.fileName);
+      if (macro_with_filename.length != 0) {
+        this.macroFound = false;
+        macro_with_filename.forEach(item => (item.file_name = "default"));
+      }
       if (filename == "default") {
         this.newGcode = "";
       } else {
         api.delete(`file/${filename}`);
         this.newGcode = "";
-        this.config.macros[this.tab - 1].file_name = "default";
         this.config.macros_list = this.config.macros_list.filter(item => item.file_name !== filename);
       }
       try {
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 66e0026..2b425a5 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -24,10 +24,20 @@ script#macros-template(type="text/x-template")
         p(slot="body")
         div(slot="footer")
           button.pure-button(@click="deleteGCode = false") Cancel
-          button.pure-button.button-error(@click="delete_current")
+          button.pure-button.button-error(@click="check_gcode_with_macro")
             .fa.fa-trash
             |  Selected
 
+    message(:show.sync="macroFound")
+        h3(slot="header") The file is currently being used by a macro.
+        p(slot="body")
+            p You need to re-select a file for the macro.
+        div(slot="footer")
+          button.pure-button(@click="macroFound = false") Cancel
+          button.pure-button.button-error(@click="delete_current")
+            .fa.fa-trash
+            |  Delete Anyway
+
     message(:show.sync="deleteSelected")
         h3(slot="header") Delete Selected Macro?
         p(slot="body")
@@ -58,6 +68,15 @@ script#macros-template(type="text/x-template")
           button.pure-button(@click="addMacros = false") Cancel
           button.pure-button.button-submit(@click="add_new_macro") Add
 
+    message(:show.sync="GCodeNotFound")
+        h3(slot="header") File not found
+        p(slot="body")
+            p It seems like the file you selected cannot be found.
+        div(slot="footer")
+          button.pure-button.button-error(@click="removeFromList")
+            .fa.fa-trash
+            |  Remove
+
     h1 Macros Configuration
     .flex-row-container
         button.config-button.button-blue(title="Reset Macros", @click="confirmReset=true") Delete All