diff --git a/linphone-app/src/components/contacts/ContactsListModel.cpp b/linphone-app/src/components/contacts/ContactsListModel.cpp
index 139a7a900..efb6522e2 100644
--- a/linphone-app/src/components/contacts/ContactsListModel.cpp
+++ b/linphone-app/src/components/contacts/ContactsListModel.cpp
@@ -100,6 +100,10 @@ QSharedPointer<ContactModel> ContactsListModel::findContactModelFromUsername (co
 }
 
 // -----------------------------------------------------------------------------
+ContactModel *ContactsListModel::getContactModelFromAddress (const QString& address) const{
+	auto contact = findContactModelFromSipAddress(address);
+	return contact.get();
+}
 
 ContactModel *ContactsListModel::addContact (VcardModel *vcardModel) {
 	// Try to merge vcardModel to an existing contact.
diff --git a/linphone-app/src/components/contacts/ContactsListModel.hpp b/linphone-app/src/components/contacts/ContactsListModel.hpp
index aa59869a3..93768a758 100644
--- a/linphone-app/src/components/contacts/ContactsListModel.hpp
+++ b/linphone-app/src/components/contacts/ContactsListModel.hpp
@@ -49,6 +49,7 @@ public:
 	QSharedPointer<ContactModel> findContactModelFromSipAddress (const QString &sipAddress) const;
 	QSharedPointer<ContactModel> findContactModelFromUsername (const QString &username) const;
 	
+	Q_INVOKABLE ContactModel *getContactModelFromAddress (const QString& address) const;
 	Q_INVOKABLE ContactModel *addContact (VcardModel *vcardModel);
 	Q_INVOKABLE void removeContact (ContactModel *contact);
 	
diff --git a/linphone-app/ui/views/App/Main/ContactEdit.js b/linphone-app/ui/views/App/Main/ContactEdit.js
index 11da59f9c..0c3b8898a 100644
--- a/linphone-app/ui/views/App/Main/ContactEdit.js
+++ b/linphone-app/ui/views/App/Main/ContactEdit.js
@@ -79,7 +79,7 @@ function removeContact () {
     if (status) {
       window.unlockView()
       window.setView('Contacts')
-      Linphone.ContactsListModel.remove(_contact)
+      Linphone.ContactsListModel.removeContact(_contact)
     }
   })
 }
diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml
index 96cb52522..1ffe07211 100644
--- a/linphone-app/ui/views/App/Main/ContactEdit.qml
+++ b/linphone-app/ui/views/App/Main/ContactEdit.qml
@@ -35,7 +35,7 @@ ColumnLayout  {
 	Component.onDestruction: {_vcard=null}// Need to set it to null because of not calling destructor if not.
 	Component.onCompleted:{
 		var sipAddress = contactEdit.sipAddress
-		var contact = contactEdit._contact = SipAddressesModel.mapSipAddressToContact(sipAddress)
+		var contact = contactEdit._contact = ContactsListModel.getContactModelFromAddress(sipAddress)
 	  
 		if (!contact) {
 		  // Add a new contact.