diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 3804f8a36..e1c1530d2 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -746,8 +746,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark - Action Functions
 
 - (IBAction)onBackClick:(id)event {
-	[_tableController setChatRoom:NULL];
-	[PhoneMainView.instance popToView:ChatsListView.compositeViewDescription];
+	[PhoneMainView.instance popCurrentView];
 }
 
 - (IBAction)onEditClick:(id)event {