diff --git a/ui/imports/shared/popups/addaccount/states/Main.qml b/ui/imports/shared/popups/addaccount/states/Main.qml
index f0359428e1..6da5bfba31 100644
--- a/ui/imports/shared/popups/addaccount/states/Main.qml
+++ b/ui/imports/shared/popups/addaccount/states/Main.qml
@@ -35,11 +35,12 @@ Item {
         }
 
         accountName.text = root.store.addAccountModule.accountName
-        if (d.isEdit) {
+        if (root.store.addAccountModule.selectedEmoji !== "") {
             accountName.input.asset.emoji = root.store.addAccountModule.selectedEmoji;
         } else {
             accountName.input.asset.isLetterIdenticon = true;
         }
+
         accountName.input.edit.forceActiveFocus()
         accountName.validate(true)
     }