diff --git a/public/js/script.js b/public/js/script.js
index 5cb32e2ea..c4f13ece4 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1481,12 +1481,12 @@ function tagsEdit(){
       hideBackgroundLoader();
       let status = e.data.resultCode;
       if(status === 1){
-        updateResultEditTagsPanelButtons();
         showNotification('Tag added',2000);
         dbSnapshot.tags.push({
           name: inputVal,
           id: e.data.id
         })
+        updateResultEditTagsPanelButtons();
         updateSettingsPage();
         updateFilterTags();
       }else if(status === -1){
@@ -1501,13 +1501,13 @@ function tagsEdit(){
       hideBackgroundLoader();
       let status = e.data.resultCode;
       if(status === 1){
-        updateResultEditTagsPanelButtons();
         showNotification('Tag updated',2000);
         dbSnapshot.tags.forEach(tag => {
           if(tag.id === tagid){
             tag.name = inputVal;
           }
         })
+        updateResultEditTagsPanelButtons();
         updateSettingsPage();
         updateFilterTags();
       }else if(status === -1){
@@ -1522,13 +1522,13 @@ function tagsEdit(){
       hideBackgroundLoader();
       let status = e.data.resultCode;
       if(status === 1){
-        updateResultEditTagsPanelButtons();
         showNotification('Tag removed',2000);
         dbSnapshot.tags.forEach((tag,index) => {
           if(tag.id === tagid){
             dbSnapshot.tags.splice(index, 1);
           }
         })
+        updateResultEditTagsPanelButtons();
         updateSettingsPage();
         updateFilterTags();
         updateActiveTags();