diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m
index 18b802743..a82a227e9 100644
--- a/Classes/ContactDetailsView.m
+++ b/Classes/ContactDetailsView.m
@@ -401,7 +401,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 	}
 	
 	self.tmpContact = NULL;
-	_isAdding = FALSE;
+	if (_isAdding) {
+		[PhoneMainView.instance popToView:ContactsListView.compositeViewDescription];
+		_isAdding = FALSE;
+	}
 }
 
 - (IBAction)onBackClick:(id)event {
diff --git a/Classes/ContactsListView.m b/Classes/ContactsListView.m
index 82d6e7117..cc9d4d127 100644
--- a/Classes/ContactsListView.m
+++ b/Classes/ContactsListView.m
@@ -193,6 +193,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (IBAction)onAddContactClick:(id)event {
 	ContactDetailsView *view = VIEW(ContactDetailsView);
 	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
+	view.isAdding = TRUE;
 	if ([ContactSelection getAddAddress] == nil) {
 		[view newContact];
 	} else {