diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp
index 2d20fb038..692af1d35 100644
--- a/src/widget/friendwidget.cpp
+++ b/src/widget/friendwidget.cpp
@@ -429,8 +429,4 @@ void FriendWidget::setAlias(const QString& _alias)
     // Hack to avoid edit const Friend. TODO: Repalce on emit
     Friend* f = FriendList::findFriend(frnd->getId());
     f->setAlias(alias);
-
-    Settings& s = Settings::getInstance();
-    s.setFriendAlias(frnd->getPublicKey(), alias);
-    s.savePersonal();
 }
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index e651b3647..033ea68ed 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1099,10 +1099,10 @@ void Widget::onFriendAliasChanged(uint32_t friendId, const QString& alias)
         GUI::setWindowTitle(alias);
     }
 
-    Status s = f->getStatus();
-    contactListWidget->moveWidget(friendWidget, s);
+    Status status = f->getStatus();
+    contactListWidget->moveWidget(friendWidget, status);
     FilterCriteria criteria = getFilterCriteria();
-    bool filter = s == Status::Offline ? filterOffline(criteria) : filterOnline(criteria);
+    bool filter = status == Status::Offline ? filterOffline(criteria) : filterOnline(criteria);
     friendWidget->searchName(ui->searchContactText->text(), filter);
 
     ChatForm* friendForm = chatForms[friendId];
@@ -1110,6 +1110,11 @@ void Widget::onFriendAliasChanged(uint32_t friendId, const QString& alias)
     for (Group* g : GroupList::getAllGroups()) {
         g->regeneratePeerList();
     }
+
+    const ToxPk& pk = f->getPublicKey();
+    Settings& s = Settings::getInstance();
+    s.setFriendAlias(pk, alias);
+    s.savePersonal();
 }
 
 void Widget::onChatroomWidgetClicked(GenericChatroomWidget* widget)