diff --git a/src/js/macros.js b/src/js/macros.js
index ff80314..8a1d786 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -419,11 +419,12 @@ module.exports = {
     delete_selected_macro: async function () {
       if (this.tab == 0) {
         this.clear_macro();
+        this.deleteSelected = false;
         return;
       }
       this.config.macros = [...this.state.macros];
       this.config.macros.splice(this.tab - 1, 1);
-      this.tab = this.state.macros.length - 1;
+      this.tab--;
       this.clear_macro();
       try {
         await api.put("config/save", this.config);
diff --git a/src/pug/templates/macros.pug b/src/pug/templates/macros.pug
index 505192a..a4a3b3f 100644
--- a/src/pug/templates/macros.pug
+++ b/src/pug/templates/macros.pug
@@ -61,7 +61,7 @@ script#macros-template(type="text/x-template")
             button.pure-button(@click="addMacros = false") Cancel
             button.pure-button.button-submit(@click="add_new_macro") Add
             
-        button.config-button.button-blue(title="Delete a Macros", @click="deleteSelected=true", style="margin-left:5px") Delete Selected Macro
+        button.config-button.button-blue(title="Delete a Macros", @click="deleteSelected=true", style="margin-left:5px;width:40%") Delete Selected Macro
 
         message(:show.sync="deleteSelected")
           div(slot="header")