diff --git a/public/index.html b/public/index.html
index 85bdcb7a5..5d5c35875 100644
--- a/public/index.html
+++ b/public/index.html
@@ -44,8 +44,7 @@
   <div id="resultEditTagsPanelWrapper" class="hidden">
     <div id="resultEditTagsPanel" resultid="">
       <div class="buttons">
-        <div class="button tag">asdf</div>
-        <div class="button active tag">asdf</div>
+
       </div>
       <div class="button confirmButton"><i class="fas fa-check"></i></div>
     </div>
diff --git a/public/js/account.js b/public/js/account.js
index c6f52f3e4..d4612aadc 100644
--- a/public/js/account.js
+++ b/public/js/account.js
@@ -886,12 +886,14 @@ function hideResultEditTagsPanel(){
 }
 
 $(document).on('click','.pageAccount .group.history #resultEditTags',f => {
-  let resultid = $(f.target).parents('span').attr('resultid');
-  let tags = $(f.target).parents('span').attr('tags');
-  $("#resultEditTagsPanel").attr('resultid',resultid);
-  $("#resultEditTagsPanel").attr('tags',tags);
-  updateActiveResultEditTagsPanelButtons(JSON.parse(tags));
-  showResultEditTagsPanel();
+  if(dbSnapshot.tags.length > 0){
+    let resultid = $(f.target).parents('span').attr('resultid');
+    let tags = $(f.target).parents('span').attr('tags');
+    $("#resultEditTagsPanel").attr('resultid',resultid);
+    $("#resultEditTagsPanel").attr('tags',tags);
+    updateActiveResultEditTagsPanelButtons(JSON.parse(tags));
+    showResultEditTagsPanel();
+  }
 })
 
 $(document).on('click','#resultEditTagsPanelWrapper .button.tag',f => {
diff --git a/public/js/script.js b/public/js/script.js
index d38742ce9..5cb32e2ea 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1481,6 +1481,7 @@ function tagsEdit(){
       hideBackgroundLoader();
       let status = e.data.resultCode;
       if(status === 1){
+        updateResultEditTagsPanelButtons();
         showNotification('Tag added',2000);
         dbSnapshot.tags.push({
           name: inputVal,
@@ -1500,6 +1501,7 @@ function tagsEdit(){
       hideBackgroundLoader();
       let status = e.data.resultCode;
       if(status === 1){
+        updateResultEditTagsPanelButtons();
         showNotification('Tag updated',2000);
         dbSnapshot.tags.forEach(tag => {
           if(tag.id === tagid){
@@ -1520,6 +1522,7 @@ 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){