diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml
index f206fcf21d..3bfed15970 100644
--- a/interface/resources/qml/hifi/AvatarApp.qml
+++ b/interface/resources/qml/hifi/AvatarApp.qml
@@ -96,7 +96,18 @@ Rectangle {
             allAvatars.move(avatarIndex, 0, 1);
             view.setPage(0);
         } else if(message.method === 'bookmarkAdded') {
-            var avatarIndex = allAvatars.addAvatarEntry(message.bookmark, message.bookmarkName);
+            var avatar = allAvatars.findAvatar(message.bookmarkName);
+            if(avatar !== undefined) {
+                var avatarObject = allAvatars.makeAvatarObject(message.bookmark, message.bookmarkName);
+                for(var prop in avatarObject) {
+                    avatar[prop] = avatarObject[prop];
+                }
+                if(currentAvatar.name === message.bookmarkName) {
+                    currentAvatar = currentAvatarModel.makeAvatarEntry(avatarObject);
+                }
+            } else {
+                allAvatars.addAvatarEntry(message.bookmark, message.bookmarkName);
+            }
             updateCurrentAvatarInBookmarks(currentAvatar);
         } else if(message.method === 'bookmarkDeleted') {
             pageOfAvatars.isUpdating = true;
diff --git a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
index 400f2bb3d6..a614567d18 100644
--- a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
+++ b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
@@ -27,6 +27,8 @@ Rectangle {
 
     function open(avatar) {
         favoriteName.text = '';
+        favoriteName.forceActiveFocus();
+
         console.debug('CreateFavoriteDialog: ', avatar.thumbnailUrl);
 
         avatarImageUrl = avatar.thumbnailUrl;
@@ -144,7 +146,7 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
 
-                yesButton.enabled: favoriteNameText !== '' && !wrongName.visible
+                yesButton.enabled: favoriteNameText !== ''
                 yesText: root.button2text
                 noText: root.button1text