diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 08e8c1488..8203c41f3 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -748,6 +748,8 @@ typedef enum : NSUInteger {
         OWSLogVerbose(@"First viewWillAppear took: %.2fms", appearenceDuration * 1000);
     }
     [self updateInputToolbarLayout];
+
+    [UIViewController attemptRotationToDeviceOrientation];
 }
 
 - (NSArray<id<ConversationViewItem>> *)viewItems
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 70f330944..1d66b0151 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -645,6 +645,8 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
     }
 
     [self.searchResultsController viewWillAppear:animated];
+
+    [UIViewController attemptRotationToDeviceOrientation];
 }
 
 - (void)viewWillDisappear:(BOOL)animated