diff --git a/NextcloudTalk/User Interface/NCUserInterfaceController.m b/NextcloudTalk/User Interface/NCUserInterfaceController.m
index 6588db2d1..25769264e 100644
--- a/NextcloudTalk/User Interface/NCUserInterfaceController.m	
+++ b/NextcloudTalk/User Interface/NCUserInterfaceController.m	
@@ -333,10 +333,9 @@ - (void)presentAlertWithTitle:(NSString *)title withMessage:(NSString *)message
 
 - (void)presentConversationsList
 {
-    [_mainViewController dismissViewControllerAnimated:YES completion:nil];
-
-    [_mainViewController popSecondaryColumnToRootViewController];
-    [_mainViewController showColumn:UISplitViewControllerColumnPrimary];
+    [_mainViewController dismissViewControllerAnimated:YES completion:^{
+        [self popToConversationsList];
+    }];
 }
 
 - (void)popToConversationsList
@@ -347,9 +346,13 @@ - (void)popToConversationsList
 
 - (void)presentChatViewController:(ChatViewController *)chatViewController
 {
-    [self presentConversationsList];
-    [_mainViewController showDetailViewController:chatViewController sender:self];
-    [_roomsTableViewController setSelectedRoomToken:chatViewController.room.token];
+    // Present conversation list first (see presentConversationsList)
+    [_mainViewController dismissViewControllerAnimated:YES completion:^{
+        [self popToConversationsList];
+
+        [self->_mainViewController showDetailViewController:chatViewController sender:self];
+        [self->_roomsTableViewController setSelectedRoomToken:chatViewController.room.token];
+    }];
 }
 
 - (void)presentCallViewController:(CallViewController *)callViewController withCompletionBlock:(PresentCallControllerCompletionBlock)block