diff --git a/admin/themes/default/js/tags.js b/admin/themes/default/js/tags.js
index 7b90e5070..bd3bdf456 100644
--- a/admin/themes/default/js/tags.js
+++ b/admin/themes/default/js/tags.js
@@ -209,8 +209,9 @@ function setupTagbox(tagBox) {
 
   //Edit Name
   tagBox.find('.dropdown-option.edit').on('click', function() {
-    tagBox.addClass('edit-name');
-    tagBox.find(".tag-name-editable").focus();
+    console.log('SALUT');
+    set_up_popin(tagBox.data('id'), tagBox.find('.tag-name').html());
+    rename_tag_open()
   })
 
   tagBox.find('.tag-rename .icon-cancel').on('click', function() {
@@ -270,6 +271,35 @@ function setupTagbox(tagBox) {
 
 }
 
+function set_up_popin(id, tagName) {
+
+  $(".RenameTagPopInContainer").find(".tag-property-input").attr("id", id);
+
+  $(".AddIconTitle span").html(str_tag_rename.replace("%s", tagName))
+  $(".ClosePopIn").on('click', function () {
+    rename_tag_close()
+  });
+  $(".TagSubmit").on('click', function () {
+    renameTag($(".RenameTagPopInContainer").find(".tag-property-input").attr("id"), $(".RenameTagPopInContainer").find(".tag-property-input").val()).then(() => {
+      console.log("then");
+      rename_tag_close();
+    }).catch((message) => {
+      console.log(message);
+    })
+  });
+  $(".TagSubmit").html(str_yes_rename_confirmation);
+  $(".RenameTagPopInContainer").find(".tag-property-input").val(tagName);
+}
+
+function rename_tag_close() {
+  $("#RenameTag").fadeOut();
+}
+
+function rename_tag_open() {
+  $("#RenameTag").fadeIn();
+  $(".tag-property-input").first().focus();
+}
+
 function removeTag(id, name) {
   $.alert({
       title : str_tag_deleted.replace("%s",name),
@@ -314,6 +344,7 @@ function renameTag(id, new_name) {
       },
       success: function (raw_data) {
         data = jQuery.parseJSON(raw_data);
+        console.log(data);
         if (data.stat === "ok") {
           $('.tag-box[data-id='+id+'] p, .tag-box[data-id='+id+'] .tag-dropdown-header b').html(data.result.name);
           $('.tag-box[data-id='+id+'] .tag-name-editable').attr('value', data.result.name);
diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index 35ffa382a..9e7b27ac0 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -5,11 +5,13 @@ var str_delete = '{'Delete tag "%s"?'|@translate}';
 var str_delete_tags = '{'Delete tags \{%s\}?'|@translate}';
 var str_yes_delete_confirmation = "{'Yes, delete'|@translate}";
 var str_no_delete_confirmation = "{"No, I have changed my mind"|@translate}";
+var str_yes_rename_confirmation = "{'Yes, rename'|@translate}";
 var str_tag_deleted = '{'Tag "%s" succesfully deleted'|@translate}';
 var str_tags_deleted = '{'Tags \{%s\} succesfully deleted'|@translate}';
 var str_already_exist = '{'Tag "%s" already exists'|@translate}';
 var str_tag_created = '{'Tag "%s" created'|@translate}';
 var str_tag_renamed = '{'Tag "%s1" renamed in "%s2"'|@translate}';
+var str_tag_rename = '{'Rename "%s"'|@translate}';
 var str_delete_orphan_tags = '{'Delete orphan tags ?'|@translate}';
 var str_orphan_tags = '{'You have %s1 orphan : %s2'|@translate}';
 var str_delete_them = '{'Delete them'|@translate}';
@@ -151,6 +153,35 @@ var str_tag_found = '{'<b>%d</b> tag found'|@translate}';
   <div></div> <a></a>
 </div>
 
+<div id="RenameTag" class="RenameTagPopIn">
+  <div class="RenameTagPopInContainer">
+    <a class="icon-cancel ClosePopIn"></a>
+    
+    <div class="AddIconContainer">
+      <span class="AddIcon icon-blue icon-tags"></span>
+    </div>
+    <div class="AddIconTitle">
+      <span>{'Rename "%s"'|@translate}</span>
+    </div>
+    <div class="RenameTagInputContainer">
+      <label class="tag-property-label TagRenameLabelUsername">{'Tag name'|@translate}
+        <input type="text" class="tag-property-input"/> 
+      </label>
+    </div>
+
+    <div class="TagErrors icon-cancel">
+    </div>
+
+    <div class="TagSubmit">
+      <span>{'Rename Tag'|@translate}</span>
+    </div>
+
+    <div class="TagCancel" style="display:none;">
+      <span>{'Cancel'|@translate}</span>
+    </div>
+  </div>
+</div>
+
 <div class='tag-container' data-tags='{$data|@json_encode|escape:html}' data-per_page={$per_page}>
   {foreach from=$first_tags item=tag}
   <div class='tag-box' data-id='{$tag.id}' data-selected='0'>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 03ac6cf55..339019788 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -3091,6 +3091,99 @@ a#showPermissions:hover {text-decoration: none;}
   color: rgba(29, 29, 29, 0.226);
 }
 
+#RenameTag {
+  display:none;
+}
+
+.AddIconContainer {
+  margin-top: 5px;
+}
+
+.RenameTagPopIn {
+  position: fixed;
+  z-index: 100;
+  left: 0;
+  top: 0;
+  width: 100%; 
+  height: 100%;
+  overflow: auto; 
+  background-color: rgba(0,0,0,0.7);
+}
+
+.RenameTagPopInContainer {
+  display:flex;
+  position:absolute;
+  left:50%;
+  top: 50%;
+  transform:translate(-50%, -48%);
+  text-align:left;
+  padding:20px;
+  flex-direction:column;
+  border-radius:15px;
+  align-items:center;
+  width: 270px;
+  background-color: white;
+}
+
+.ClosePopIn {
+  position: absolute;
+  right: -40px;
+  top: -40px;
+  font-size: 30px;
+  color: white;
+}
+
+.AddIcon {
+  border-radius: 9999px;
+  padding: 10px;
+  font-size: 2em;
+}
+.AddIconTitle {
+  font-size: 1.4em;
+  font-weight: bold;
+  text-align: center;
+  color: #000;
+  margin-bottom: 10px;
+  margin-top: 15px;
+}
+
+.tag-property-label {
+  color:#A4A4A4;
+  font-weight:bold;
+  font-size:1.1em;
+  margin-bottom:5px;
+}
+.tag-property-input {
+  width: 100%;
+  box-sizing:border-box;
+  font-size:1.1em;
+  padding:8px 16px;
+  border:none;
+}
+
+.TagErrors {
+  visibility:hidden;
+  width:100%;
+  padding:5px;
+  border-left:solid 3px red;
+}
+.TagSubmit {
+  cursor:pointer;
+  font-weight:bold;
+  color: #3F3E40;
+  background-color: #FFA836;
+  padding: 10px;
+  margin: 20px;
+  font-size:1em;
+  margin-bottom:0;
+}
+.TagCancel {
+  color: #3F3E40;
+  font-weight: bold;
+  cursor: pointer;
+  font-size:1em;
+}
+
 /* Picture Edit */
 #pictureModify {
   display: flex;