diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m
index be1f6a24f..8036b7180 100644
--- a/Classes/ContactDetailsView.m
+++ b/Classes/ContactDetailsView.m
@@ -501,9 +501,15 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if ([ContactSelection getSelectionMode] == ContactSelectionModeEdit) {
 		[ContactSelection setSelectionMode:ContactSelectionModeNone];
 	}
-
-	ContactsListView *view = VIEW(ContactsListView);
-	[PhoneMainView.instance popToView:view.compositeViewDescription];
+	
+	NSString* previous = [PhoneMainView.instance  getPreviousViewName];
+	if ([previous isEqualToString:@"ContactsListView"]) {
+		ContactsListView *view = VIEW(ContactsListView);
+		[PhoneMainView.instance popToView:view.compositeViewDescription];
+	} else {
+		HistoryDetailsView *view = VIEW(HistoryDetailsView);
+		[PhoneMainView.instance popToView:view.compositeViewDescription];
+	}
 }
 
 - (IBAction)onEditClick:(id)event {