diff --git a/admin/themes/default/js/tags.js b/admin/themes/default/js/tags.js
index 6206599d4..0bf156ec4 100644
--- a/admin/themes/default/js/tags.js
+++ b/admin/themes/default/js/tags.js
@@ -212,6 +212,7 @@ function setupTagbox(tagBox) {
   //Edit Name
   tagBox.find('.dropdown-option.edit').on('click', function() {
     tagBox.addClass('edit-name');
+    tagBox.find(".tag-name-editable").focus();
   })
 
   tagBox.find('.tag-rename .icon-cancel').on('click', function() {