diff --git a/src/js/macros.js b/src/js/macros.js
index a5854d4..a119d4d 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -47,10 +47,12 @@ module.exports = {
       return this.tab > 8;
     },
     macros_gcode_list: function () {
-      return this.config.macros_list
-        .filter(item => this.state.files.includes(item.file_name))
-        .map(item => item.file_name)
-        .sort();
+      return (
+        this.config.macros_list
+          // .filter(item => this.state.files.includes(item.file_name))
+          .map(item => item.file_name)
+          .sort()
+      );
     },
     macros_list: function () {
       return this.config.macros.map(item => item.name);
@@ -105,6 +107,7 @@ module.exports = {
         const response = await fetch(`/api/file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${file}`, {
           cache: "no-cache",
         });
+        console.log("response", response);
         if (response.status == 200) {
           const text = await response.text();
           this.newGcode = text;
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index d370e77..66e0026 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -81,7 +81,7 @@ script#macros-template(type="text/x-template")
                         p.title Macro Name
                         .input-container
                                 input.input-color(type="color",id="macros-color",value="#ffffff",@change="editedColor") 
-                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name" ,v-model="macrosName",@keypress="editedName")
+                                input.input-name(type="text",minlength='1',maxlength='15',id="macros-name" ,v-model="macrosName",@keydown="editedName")
                         div
                           input.input-alert(type="checkbox",id="macros-alert" v-model="isChecked",@change="editedAlert")
                           label Would you like an alert when running this macro?