diff --git a/ui/imports/shared/popups/NicknamePopup.qml b/ui/imports/shared/popups/NicknamePopup.qml
index c0a83667ee..fb40b7b865 100644
--- a/ui/imports/shared/popups/NicknamePopup.qml
+++ b/ui/imports/shared/popups/NicknamePopup.qml
@@ -23,7 +23,7 @@ StatusModal {
     property int nicknameLength: nicknameInput.textField.text.length
     readonly property int maxNicknameLength: 32
     property bool nicknameTooLong: nicknameLength > maxNicknameLength
-    signal doneClicked(string newNickname)
+    signal editDone(string newNickname)
 
     onOpened: {
         nicknameInput.forceActiveFocus(Qt.MouseFocusReason);
@@ -59,7 +59,7 @@ StatusModal {
                 validationError: popup.nicknameTooLong ? qsTrId("your-nickname-is-too-long") : ""
                 Keys.onReleased: {
                     if (event.key === Qt.Key_Return) {
-                        doneBtn.onClicked();
+                        editDone()
                     }
                 }
 
@@ -82,9 +82,7 @@ StatusModal {
             //% "Done"
             text: qsTrId("done")
             enabled: !popup.nicknameTooLong
-            onClicked: {
-                doneClicked(nicknameInput.textField.text)
-            }
+            onClicked: editDone(nicknameInput.textField.text)
         }
     ]
 }
diff --git a/ui/imports/shared/popups/ProfilePopup.qml b/ui/imports/shared/popups/ProfilePopup.qml
index 50555afbbd..ace3232e00 100644
--- a/ui/imports/shared/popups/ProfilePopup.qml
+++ b/ui/imports/shared/popups/ProfilePopup.qml
@@ -257,7 +257,7 @@ StatusModal {
             nickname: popup.userNickname
             header.subTitle: popup.header.subTitle
             header.subTitleElide: popup.header.subTitleElide
-            onDoneClicked: {
+            onEditDone: {
                 if(popup.userNickname !== newNickname)
                 {
                     popup.userNickname = newNickname;