diff --git a/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp b/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp
index 7c4186553..dc09006e9 100644
--- a/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp
+++ b/linphone-app/src/components/sip-addresses/SipAddressesModel.cpp
@@ -107,18 +107,20 @@ QVariant SipAddressesModel::data (const QModelIndex &index, int role) const {
 // -----------------------------------------------------------------------------
 
 QVariantMap SipAddressesModel::find (const QString &sipAddress) const {
-  auto it = mPeerAddressToSipAddressEntry.find(sipAddress);
-  if (it == mPeerAddressToSipAddressEntry.end())
-    return QVariantMap();
+	QString cleanedAddress = Utils::cleanSipAddress(sipAddress);
+	auto it = mPeerAddressToSipAddressEntry.find(cleanedAddress);
+	if (it == mPeerAddressToSipAddressEntry.end())
+		return QVariantMap();
 
-  return buildVariantMap(*it);
+	return buildVariantMap(*it);
 }
 
 // -----------------------------------------------------------------------------
 
 ContactModel *SipAddressesModel::mapSipAddressToContact (const QString &sipAddress) const {
-  auto it = mPeerAddressToSipAddressEntry.find(sipAddress);
-  return it == mPeerAddressToSipAddressEntry.end() ? nullptr : it->contact;
+	QString cleanedAddress = Utils::cleanSipAddress(sipAddress);
+	auto it = mPeerAddressToSipAddressEntry.find(cleanedAddress);
+	return it == mPeerAddressToSipAddressEntry.end() ? nullptr : it->contact;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index eb2a78de6..d395f1527 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -182,8 +182,8 @@ ApplicationWindow {
 													 })
 						
 						onEntryClicked: {
-							if (entry.contact && SettingsModel.contactsEnabled) {
-								window.setView('ContactEdit', { sipAddress: entry.sipAddress })
+							if (SettingsModel.contactsEnabled) {
+								window.setView('ContactEdit', { sipAddress: entry })
 							} else {
 								CallsListModel.createChatRoom( "", false, [entry], true )
 							}