diff --git a/Classes/ContactsListTableView.m b/Classes/ContactsListTableView.m
index f73ebd72e..f55c0cb93 100644
--- a/Classes/ContactsListTableView.m
+++ b/Classes/ContactsListTableView.m
@@ -230,7 +230,7 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
 		// Go to Contact details view
 		ContactDetailsView *view = VIEW(ContactDetailsView);
 		[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
-		if ([ContactSelection getSelectionMode] != ContactSelectionModeEdit) {
+		if (([ContactSelection getSelectionMode] != ContactSelectionModeEdit) || !([ContactSelection getAddAddress])) {
 			[view setContact:lPerson];
 		} else {
 			[view editContact:lPerson address:[ContactSelection getAddAddress]];
diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m
index 881032225..dbb6c0dcc 100644
--- a/Classes/ContactsListView.m
+++ b/Classes/ContactsListView.m
@@ -37,12 +37,7 @@ static NSString *sNameOrEmailFilter;
 }
 
 + (void)setAddAddress:(NSString *)address {
-	if (sAddAddress != nil) {
-		sAddAddress = nil;
-	}
-	if (address != nil) {
-		sAddAddress = address;
-	}
+	sAddAddress = address;
 }
 
 + (NSString *)getAddAddress {